diff --git a/src/python/CRABClient/ClientMapping.py b/src/python/CRABClient/ClientMapping.py
index 541404ed9..68410d7b8 100644
--- a/src/python/CRABClient/ClientMapping.py
+++ b/src/python/CRABClient/ClientMapping.py
@@ -12,8 +12,8 @@
 """
 
 mapping = {
-    'submit' :  { 'map': {  "jobtype"       : {"default": "Analysis",       "config": None,                     "type": "StringType",  "required": True },
-                            "workflow"       : {"default": None,             "config": None,                     "type": "StringType",  "required": True },
+    'submit' :  { 'map': {  "jobtype"           : {"default": "Analysis",       "config": None,                     "type": "StringType",  "required": True },
+                            "workflow"          : {"default": None,             "config": None,                     "type": "StringType",  "required": True },
                             "savelogsflag"      : {"default": False,            "config": 'General.saveLogs',       "type": "BooleanType", "required": True },
                             "asyncdest"         : {"default": None,             "config": 'Site.storageSite',       "type": "StringType",  "required": True },
                             "publishname"       : {"default": '', "config": 'Data.publishDataName',   "type": "StringType",  "required": True },
@@ -33,6 +33,7 @@
                             "numcores"          : {"default": None,             "config": "JobType.numcores",       "type": "IntType",     "required": False},
                             "maxmemory"         : {"default": None,             "config": "JobType.maxmemory",      "type": "IntType",     "required": False},
                             "priority"          : {"default": None,             "config": "JobType.priority",       "type": "IntType",     "required": False},
+                            "nonprodsw"         : {"default": False,            "config": "JobType.allowNonProductionCMSSW", "type": "BooleanType", "required": False},
                          },
                   'other-config-params' : ["General.serverUrl", "General.requestName", "General.workArea",
                                            "JobType.pluginName", "JobType.externalPluginFile", "JobType.psetName",
diff --git a/src/python/CRABClient/Commands/submit.py b/src/python/CRABClient/Commands/submit.py
index c936df306..0d18ceb45 100644
--- a/src/python/CRABClient/Commands/submit.py
+++ b/src/python/CRABClient/Commands/submit.py
@@ -81,10 +81,12 @@ def __call__(self):
             if param == "workflow":
                 if mustbetype == type(self.requestname):
                     configreq["workflow"] = self.requestname
-            elif param == "savelogsflag":
+            elif param == "savelogsflag":#TODO use clientmappig to do this
                 configreq["savelogsflag"] = 1 if temp else 0
             elif param == "publication":
                 configreq["publication"] = 1 if temp else 0
+            elif param == "nonprodsw":
+                configreq["nonprodsw"] = 1 if temp else 0
 
         # Add debug parameters to the configreq dict
         configreq['oneEventMode'] = int(oneEventMode)
@@ -258,7 +260,7 @@ def checkStatusLoop(self,server,uniquerequestname):
             self.logger.info("Task status:%s" % dictresult['status'])
 
             if dictresult['status'] == 'FAILED':
-                self.logger.info("Submission jobs failed, Please check crab.log and config file ")
+                self.logger.info("Submission jobs failed, Please check crab.log and config file. You might find more information about the failure with crab status -t  <Task Name>")
                 break
             elif dictresult['status'] == 'SUBMITTED':
                 self.logger.info("Task has been processed and jobs have been submitted successfully")