diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
index b91594d3..68958596 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
@@ -314,7 +314,8 @@ public class CouchbaseTemplate implements CouchbaseOperations, ApplicationEventP
           if (cas == CASResponse.EXISTS) {
             throw new OptimisticLockingFailureException("Saving document with version value failed: " + cas);
           } else {
-            long newCas = casFuture.getCas();
+            Long casValue = casFuture.getCas();
+            long newCas = (casValue == null) ? 0 : casValue.longValue();
             beanWrapper.setProperty(versionProperty, newCas);
             return true;
           }