diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp
--- a/src/test/script_standard_tests.cpp
+++ b/src/test/script_standard_tests.cpp
@@ -36,6 +36,11 @@
 
 BOOST_FIXTURE_TEST_SUITE(script_standard_tests, BasicTestingSetup)
 
+BOOST_AUTO_TEST_CASE(dest_default_is_no_dest) {
+    CTxDestination dest;
+    BOOST_CHECK(!IsValidDestination(dest));
+}
+
 BOOST_AUTO_TEST_CASE(script_standard_Solver_success) {
     CKey keys[3];
     CPubKey pubkeys[3];
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3072,7 +3072,10 @@
             }
 
             scriptChange = GetScriptForDestination(dest);
-            assert(!dest.empty() || scriptChange.empty());
+            // A valid destination implies a change script (and
+            // vice-versa). An empty change script will abort later, if the
+            // change keypool ran out, but change is required.
+            CHECK_NONFATAL(IsValidDestination(dest) != scriptChange.empty());
         }
         CTxOut change_prototype_txout(Amount::zero(), scriptChange);
         coin_selection_params.change_output_size =
@@ -3311,8 +3314,7 @@
             continue;
         }
 
-        // Give up if change keypool ran out and we failed to find a solution
-        // without change:
+        // Give up if change keypool ran out and change is required
         if (scriptChange.empty() && nChangePosInOut != -1) {
             return false;
         }