diff --git a/quests/exceptions.yml b/quests/exceptions.yml
index 1cabbca..edf5341 100644
--- a/quests/exceptions.yml
+++ b/quests/exceptions.yml
@@ -28,7 +28,7 @@ exceptions:
 
   - condition:
       command:
-        - ^echo\S$
+        - ^echo[^\s]
     responses:
       - type: narrative
         content:
@@ -36,7 +36,7 @@ exceptions:
 
   - condition:
       command:
-        - ^cd\S$
+        - ^cd\S
     responses:
       - type: narrative
         content:
@@ -44,7 +44,7 @@ exceptions:
 
   - condition:
       command:
-        - ^ls\S$
+        - ^ls\S
     responses:
       - type: narrative
         content:
@@ -52,7 +52,7 @@ exceptions:
 
   - condition:
       command:
-        - ^cat\S$
+        - ^cat\S
     responses:
       - type: narrative
         content:
@@ -60,7 +60,7 @@ exceptions:
 
   - condition:
       command:
-        - ^touch\S$
+        - ^touch\S
     responses:
       - type: narrative
         content:
@@ -71,7 +71,7 @@ exceptions:
         command:
           - ^rmdir$
       command:
-        - ^rm\S$
+        - ^rm\S
     responses:
       - type: narrative
         content:
@@ -79,7 +79,7 @@ exceptions:
 
   - condition:
       command:
-        - ^mv\S$
+        - ^mv\S
     responses:
       - type: narrative
         content:
@@ -87,7 +87,7 @@ exceptions:
 
   - condition:
       command:
-        - ^mkdir\S$
+        - ^mkdir\S
     responses:
       - type: narrative
         content:
@@ -95,7 +95,7 @@ exceptions:
 
   - condition:
       command:
-        - ^rmdir\S$
+        - ^rmdir\S
     responses:
       - type: narrative
         content:
@@ -103,7 +103,7 @@ exceptions:
 
   - condition:
       command:
-        - ^cp\S$
+        - ^cp\S
     responses:
       - type: narrative
         content:
@@ -111,7 +111,7 @@ exceptions:
 
   - condition:
       command:
-        - ^[Ii1]s$
+        - ^[Ii1]s
     responses:
       - type: narrative
         content: