diff --git a/CMakeLists.txt b/CMakeLists.txt
index 832dc2db..e957b214 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ SET(CPACK_PACKAGE_CONTACT "Jon Gough")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "39")
-SET(VERSION_DATE "16/12/2017")
+SET(VERSION_PATCH "40")
+SET(VERSION_DATE "19/12/2017")
 
 SET(BUNDLE_DATA FALSE)
 SET( CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build" )
diff --git a/src/ODNavObjectChanges.cpp b/src/ODNavObjectChanges.cpp
index 1ab244da..7ec2b64f 100644
--- a/src/ODNavObjectChanges.cpp
+++ b/src/ODNavObjectChanges.cpp
@@ -658,6 +658,7 @@ bool ODNavObjectChanges::GPXCreatePath( pugi::xml_node node, ODPath *pInPath )
             pop = dynamic_cast<BoundaryPoint *>(node2->GetData());
         else 
             pop = node2->GetData();
+        assert(pop != 0);
             
         GPXCreateODPoint(node.append_child("opencpn:ODPoint"), pop, OPT_OCPNPOINT);