diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index dc0b19ecc..36ebb1893 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4960,6 +4960,8 @@ UniValue channelsaddress(const UniValue& params, bool fHelp)
 
 bool pubkey2addr(char *destaddr,uint8_t *pubkey33);
 extern int32_t IS_KOMODO_NOTARY;
+extern uint8_t NOTARY_PUBKEY33[];
+extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
 
 UniValue setpubkey(const UniValue& params, bool fHelp)
 {
@@ -4989,8 +4991,6 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
 
     char Raddress[18];
     uint8_t pubkey33[33];
-    extern uint8_t NOTARY_PUBKEY33[];
-    extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
     if ( NOTARY_PUBKEY33[0] == 0 ) {
         if (strlen(params[0].get_str().c_str()) == 66) {
             decode_hex(pubkey33,33,(char *)params[0].get_str().c_str());
@@ -5006,8 +5006,8 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
                     NOTARY_ADDRESS = address.ToString();
                     result.push_back(Pair("address", NOTARY_ADDRESS));
 #ifdef ENABLE_WALLET
-                    isminetype mine = pwalletMain;
-                    if ( IsMine(*pwalletMain, dest) == ISMINE_NO ) {
+                    isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
+                    if ( mine == ISMINE_NO ) {
                         result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!"));
                     } else {
                         result.push_back(Pair("ismine", "true"));
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8a8f96d8f..50a825cc6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1202,6 +1202,7 @@ bool CWallet::UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx)
  */
 extern uint8_t NOTARY_PUBKEY33[33];
 extern std::string NOTARY_ADDRESS;
+extern int32_t IS_KOMODO_NOTARY;
 
 bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate)
 {
@@ -1254,7 +1255,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
                     // this means we were in a multi sig, we wil remove the utxo we spent from our wallet,
                     // IF there exisited a function for that.
                     // Maybe check if there are any vouts unspetn in this TX
-                    // then purge the TX from wallet if all spent? 
+                    // then purge the TX from wallet if all spent?
                     fprintf(stderr, "There are vins that are not ours, notarisation?\n");
                 }
             }