diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 4f43280d..07707219 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -347,11 +347,11 @@ int main(int argc, char* const argv[])
         Jzon::Writer writer(root, Jzon::StandardFormat);
         writer.Write();
         std::cout << writer.GetResult() << std::endl;
-        return 0;
+        return EXIT_SUCCESS;
     }
 
     catch (Exiv2::Error& e) {
         std::cout << "Caught Exiv2 exception '" << e.what() << "'\n";
-        return -1;
+        return EXIT_FAILURE;
     }
 }
diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index b3af7429..30ff4a5a 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -1128,7 +1128,7 @@ XMPMeta::DeleteNamespace ( XMP_StringPtr namespaceURI )
 	if ( uriPos == sNamespaceURIToPrefixMap->end() ) return;
 
 	XMP_StringMapPos prefixPos = sNamespacePrefixToURIMap->find ( uriPos->second );
-	XMP_Assert ( prefixPos != sNamespacePrefixToURIMap->end() );
+	if ( prefixPos == sNamespacePrefixToURIMap->end() ) return;
 	
 	sNamespaceURIToPrefixMap->erase ( uriPos );
 	sNamespacePrefixToURIMap->erase ( prefixPos );