diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
index 8b96bce8ba5..1891678e830 100644
--- a/STL_Extension/include/CGAL/Compact_container.h
+++ b/STL_Extension/include/CGAL/Compact_container.h
@@ -1147,7 +1147,7 @@ namespace internal {
                   Nullptr_t CGAL_assertion_code(n))
   {
     CGAL_assertion( n == NULL);
-    return &*rhs == NULL;
+    return rhs == CC_iterator<DSC, Const>();
   }
 
   template < class DSC, bool Const >
@@ -1156,7 +1156,7 @@ namespace internal {
                   Nullptr_t CGAL_assertion_code(n))
   {
     CGAL_assertion( n == NULL);
-    return &*rhs != NULL;
+    return rhs !=  CC_iterator<DSC, Const>();
   }
 
 } // namespace internal
diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h
index 8be7fde982c..9e671720814 100644
--- a/STL_Extension/include/CGAL/vector.h
+++ b/STL_Extension/include/CGAL/vector.h
@@ -196,7 +196,7 @@ protected:
         }
     }
     void deallocate() {
-        if ( &*start_)
+        if ( start_ != iterator() )
             alloc.deallocate( &*start_, end_of_storage - start_ );
     }