Index: /trunk/umit/gui/Wizard.py
===================================================================
--- /trunk/umit/gui/Wizard.py (revision 4789)
+++ /trunk/umit/gui/Wizard.py (revision 5535)
@@ -263,15 +263,26 @@
     
     def profile_forward(self, widget):
-        if self.directions['Profile'].profile_entry.get_text() == '':
+        profile_name = self.directions['Profile'].profile_entry.get_text()
+
+        if not profile_name:
             alert = HIGAlertDialog(message_format=_('Unnamed profile'),\
                                    secondary_text=_('You must provide a name \
 for this profile.'))
+        elif profile_name.lower() == 'default':
+            alert = HIGAlertDialog(message_format=_('Reserved profile name'),\
+                                   secondary_text=_('Cannot assign "default" \
+name to this profile. Please rename it and retry.'))
+        else:
+            alert = None
+
+        if alert:
+
             alert.run()
             alert.destroy()
-            
+
             self.directions['Profile'].profile_entry.grab_focus()
-            
+
             return None
-        
+
         self.main_vbox.remove(self.directions['Profile'])
         self.main_vbox._pack_expand_fill(self.directions['Command'])
@@ -349,4 +360,5 @@
             annotation = buffer.get_text(buffer.get_start_iter(),\
                                           buffer.get_end_iter())
+
             self.profile.add_profile(profile_name,\
                                      command=command,\
Index: /trunk/umit/gui/ProfileEditor.py
===================================================================
--- /trunk/umit/gui/ProfileEditor.py (revision 5147)
+++ /trunk/umit/gui/ProfileEditor.py (revision 5535)
@@ -243,8 +243,18 @@
     def save_profile(self, widget):
         profile_name = self.profile_name_entry.get_text()
+
         if profile_name == '':
             alert = HIGAlertDialog(message_format=_('Unnamed profile'),\
                                    secondary_text=_('You must provide a name \
 for this profile.'))
+
+        elif profile_name.lower() == 'default':
+            alert = HIGAlertDialog(message_format=_('Reserved profile name'),\
+                                   secondary_text=_('Cannot assign "default" \
+name to this profile. Please rename it and retry.'))
+        else:
+            alert = None
+
+        if alert:
             alert.run()
             alert.destroy()
Index: /trunk/umit/core/UmitConf.py
===================================================================
--- /trunk/umit/core/UmitConf.py (revision 5229)
+++ /trunk/umit/core/UmitConf.py (revision 5535)
@@ -199,4 +199,6 @@
             self.add_section(profile_name)
         except DuplicateSectionError:
+            return None
+        except ValueError:
             return None