diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f7c66a7a8..1f52d9e24 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -238,8 +238,7 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
             return(true);
         }
         fprintf(stderr,"ExtractDestination failed\n");
-    }
-    fprintf(stderr,"Getscriptaddress nonstandard\n");
+    } else fprintf(stderr,"Getscriptaddress nonstandard\n");
     return(false);
 }
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bdba59eca..e2b4e13dd 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -251,6 +251,12 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }
+    
+    else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
+    {
+        addressRet = CScriptID(uint160(vSolutions[0]));
+        return true;
+    }
     // Multisig txns have more than one address...
     return false;
 }