diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 5b984b1d0..10b2741da 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -116,15 +116,30 @@ def getParamType(param):
     else:
         return None
 
-def getParam(param):
+def getParam(param,default=None):
     "getParam(parameterName): returns a Draft parameter value from the current config"
     p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
     t = getParamType(param)
-    if t == "int": return p.GetInt(param)
-    elif t == "string": return p.GetString(param)
-    elif t == "float": return p.GetFloat(param)
-    elif t == "bool": return p.GetBool(param)
-    elif t == "unsigned": return p.GetUnsigned(param)
+    if t == "int": 
+        if default == None:
+            default = 0
+        return p.GetInt(param,default)
+    elif t == "string": 
+        if default == None:
+            default = ""
+        return p.GetString(param,default)
+    elif t == "float": 
+        if default == None:
+            default = 0
+        return p.GetFloat(param,default)
+    elif t == "bool": 
+        if default == None:
+            default = False
+        return p.GetBool(param,default)
+    elif t == "unsigned":
+        if default == None:
+            default = 0
+        return p.GetUnsigned(param,default)
     else: return None
 
 def setParam(param,value):
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 45d816428..66233cdb8 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -169,7 +169,8 @@ class DraftToolBar:
         self.sourceCmd = None
         self.cancel = None
         self.pointcallback = None
-        self.taskmode = Draft.getParam("UiMode")
+        self.taskmode = Draft.getParam("UiMode",1)
+        #print "taskmode: ",str(self.taskmode)
         self.paramcolor = Draft.getParam("color")>>8
         self.color = QtGui.QColor(self.paramcolor)
         self.facecolor = QtGui.QColor(204,204,204)