diff --git a/src/main/java/com/iota/iri/service/TipsManager.java b/src/main/java/com/iota/iri/service/TipsManager.java
index 957c8de11b..ea070b4d1a 100644
--- a/src/main/java/com/iota/iri/service/TipsManager.java
+++ b/src/main/java/com/iota/iri/service/TipsManager.java
@@ -189,7 +189,6 @@ Hash randomWalk(final Hash start, final Hash extraTip, final Map<Hash, Long> rat
                     messageQ.publish("rtsn %s", transactionViewModel.getHash());
                     break;
                 } else if (!transactionValidator.checkSolidity(transactionViewModel.getHash(), false)) {
-                    //} else if (!transactionViewModel.isSolid()) {
                     log.info("Reason to stop: !checkSolidity");
                     messageQ.publish("rtss %s", transactionViewModel.getHash());
                     break;
@@ -255,6 +254,11 @@ Hash randomWalk(final Hash start, final Hash extraTip, final Map<Hash, Long> rat
         }
         log.info("Tx traversed to find tip: " + traversedTails);
         messageQ.publish("mctn %d", traversedTails);
+
+        if (traversedTails == 0) {
+            throw new RuntimeException("starting tip failed consistency checks: " + tail.toString());
+        }
+
         return tail;
     }