diff --git a/core/c/mpw-marshall.c b/core/c/mpw-marshall.c
index ce3acbdb..bc25afa9 100644
--- a/core/c/mpw-marshall.c
+++ b/core/c/mpw-marshall.c
@@ -109,7 +109,7 @@ bool mpw_marshal_info_free(
 bool mpw_marshal_free(
         MPMarshalledUser **user) {
 
-    if (!user)
+    if (!user || !*user)
         return true;
 
     bool success = true;
diff --git a/platform-independent/cli-c/cli/mpw-cli.c b/platform-independent/cli-c/cli/mpw-cli.c
index dabfbfc4..eb046d95 100644
--- a/platform-independent/cli-c/cli/mpw-cli.c
+++ b/platform-independent/cli-c/cli/mpw-cli.c
@@ -544,7 +544,6 @@ int main(int argc, char *const argv[]) {
             case MPKeyPurposeAuthentication: {
                 mpw_free_string( &site->content );
                 site->content = strdup( resultState );
-                dbg( "site->content: %p", (void *)site->content );
                 break;
             }
             case MPKeyPurposeIdentification: {