--- a/mamba/habitats/editor.py	Thu Sep 15 17:57:28 2011 +0200
+++ b/mamba/habitats/editor.py	Thu Sep 15 18:01:43 2011 +0200
@@ -148,11 +148,14 @@
         self.current_tool.prepare()
 
     def save(self, ev, widget):
-        if self.level.level_name in RESERVED_NAMES:
-            print "Can't save over reserved name"
-            return
-        if not self.level:
-            print "Need a level name"
+        messagebox = None
+        if not self.level.level_name:
+            messagebox = MessageBox((300, 300), 'Please enter a name')
+        elif self.level.level_name in RESERVED_NAMES:
+            messagebox = MessageBox((300, 300), 'Reserved level name')
+        if messagebox:
+            self.container.add(messagebox)
+            messagebox.grab_focus()
             return
         self.level.save_level()
 
@@ -234,7 +237,12 @@
             return True  # No-op change
         if not new_name:
             messagebox = MessageBox((300, 300), 'Please enter a name')
-        if check_level_exists(new_name):
+        if new_name in RESERVED_NAMES:
+            # This case is caught by the existance check, but the
+            # importance of the reserved names means we use a different
+            # message
+            messagebox = MessageBox((300, 300), 'Reserved level name')
+        elif check_level_exists(new_name):
             messagebox = MessageBox((300, 300), 'Name already in use')
         if messagebox:
             self.container.add(messagebox)