diff --git a/evennia/contrib/puzzles.py b/evennia/contrib/puzzles.py
index 39c8a69765..0cab7859ac 100644
--- a/evennia/contrib/puzzles.py
+++ b/evennia/contrib/puzzles.py
@@ -305,7 +305,7 @@ class CmdEditPuzzle(MuxCommand):
 
         puzzle = search.search_script(recipe_dbref)
         if not puzzle or not inherits_from(puzzle[0], PuzzleRecipe):
-            caller.msg('Invalid puzzle %r'  % (recipe_dbref))
+            caller.msg('%s(%s) is not a puzzle'  % (puzzle[0].name, recipe_dbref))
             return
 
         puzzle = puzzle[0]
diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 13e06f209f..4810ec9d09 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -1440,17 +1440,23 @@ class TestPuzzles(CommandTest):
         self.fire.delete()
 
         def _puzzleedit(swt, dbref, args, expmsg):
+            if (swt is None) and (dbref is None) and (args is None):
+                cmdstr = ''
+            else:
+                cmdstr = '%s %s%s' % (swt, dbref, args)
             self.call(
                 puzzles.CmdEditPuzzle(),
-                '%s %s%s' % (swt, dbref, args),
+                cmdstr,
                 expmsg,
                 caller=self.char1
             )
 
         # bad syntax
+        _puzzleedit(None, None, None, "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
         _puzzleedit('', '1', '', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
         _puzzleedit('', '', '', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
         _puzzleedit('', recipe_dbref, 'dummy', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
+        _puzzleedit('', self.script.dbref, '', 'Script(#1) is not a puzzle')
 
         # no permissions
         _puzzleedit('', recipe_dbref, '/use_success_message = Yes!', "You don't have permission")