diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
index b6adcbe8b..f72e313e2 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java
@@ -173,7 +173,7 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
      * @return value to which the given key is mapping after this call, either found or created
      * @see #getUsing(Object, Object)
      */
-    V acquireUsing(@NotNull K key, @NotNull V usingValue);
+    V acquireUsing(@NotNull K key, V usingValue);
 
 
     @NotNull
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 48ee4a387..0004e2081 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -391,7 +391,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
     }
 
 
-    public synchronized V acquireUsing(@NotNull K key, @NotNull V usingValue) {
+    public synchronized V acquireUsing(@NotNull K key,  V usingValue) {
         throw new UnsupportedOperationException("acquireUsing() is not supported for stateless " +
                 "clients");
     }
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 051520842..0189ea22f 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -383,7 +383,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
 
 
     @Override
-    public V acquireUsing(@NotNull K key, @NotNull V usingValue) {
+    public V acquireUsing(@NotNull K key, V usingValue) {
 
         try (WriteContext<K, V> kvContext =
                      lookupUsing(key, usingValue, LockType.WRITE_LOCK, false)) {
@@ -856,7 +856,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
 
         V acquireWithoutLock(ThreadLocalCopies copies, MKI metaKeyInterop, KI keyInterop, K key, V usingValue,
-                   long hash2, boolean create) {
+                             long hash2, boolean create) {
             long keySize = metaKeyInterop.size(keyInterop, key);
             MultiStoreBytes entry = acquireTmpBytes();
             long offset = searchKey(keyInterop, metaKeyInterop, key, keySize, hash2, entry,
diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
index 0ab98e923..6c7337300 100644
--- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
@@ -418,7 +418,7 @@ public class ChronicleMapTest {
         map.close();
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testAcquireWithNullContainer() throws Exception {
         ChronicleMap<CharSequence, LongValue> map = getSharedMap(10 * 1000, 128, 24);
         map.acquireUsing("key", new LongValue$$Native());
diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
index a11205ece..ee72bda1f 100644
--- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
+++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java
@@ -246,7 +246,7 @@ public class ReplicationCheckingMap<K, V> implements ChronicleMap<K, V> {
     }
 
     @Override
-    public V acquireUsing(@NotNull K key, @NotNull V usingValue) {
+    public V acquireUsing(@NotNull K key,  V usingValue) {
         return map1.acquireUsing(key, usingValue);
     }
 
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
index 961455a08..f1ac2f7c8 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java
@@ -151,7 +151,7 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
         }
 
         @Override
-        public V acquireUsing(@NotNull K key, @NotNull V usingValue) {
+        public V acquireUsing(@NotNull K key,V usingValue) {
             return d.acquireUsing(key, usingValue);
         }