diff --git a/scripts/verify_no_uuid.sh b/scripts/verify_no_uuid.sh
index 228bd652b7..4e9edf2ece 100755
--- a/scripts/verify_no_uuid.sh
+++ b/scripts/verify_no_uuid.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
-set -e
+
 grep generateUUID consul/state_store.go
 RESULT=$?
+if [ $RESULT -eq 0 ]; then
+    exit 1
+fi
 
+grep generateUUID consul/fsm.go
+RESULT=$?
 if [ $RESULT -eq 0 ]; then
     exit 1
 fi