diff -r 9880bb697149 -r ac07779f788d modulecore.py
--- a/modulecore.py	Mon Jan 19 16:42:36 2015 -0500
+++ b/modulecore.py	Sat Apr 11 21:02:09 2015 +0300
@@ -162,12 +162,14 @@
 		func (**commandObject)
 	except Confirmxeption as e:
 		if time.time() - g_lastConfirm < 15 and g_confirmCommand != None:
-			command_error ('another confirm is underway')
+			command_error ('''another confirm is underway''')
 
 		g_lastConfirm = time.time()
 		response_function (str (e) + ' (.yes/.no)')
 		commandObject['confirmed'] = e.id
 		g_confirmCommand = commandObject
+	except Exception as e:
+		command_error (str (e))
 
 #
 # call_command (bot, message, cmdname, **kvargs)
@@ -322,9 +324,9 @@
 			arg = arg[0:-3]
 
 		if gotoptional == False:
-			regex += '\s+'
+			regex += r'\s+'
 		else:
-			regex += '\s*'
+			regex += r'\s*'
 
 		if gotliteral:
 			regex += arg
@@ -341,5 +343,8 @@
 		#fi
 	#done
 
+	if not gotvariadic:
+		regex += r'\s*'
+
 	return '^[^ ]+%s$' % regex
 #enddef