diff --git a/front/plugins/newdev_template/config.json b/front/plugins/newdev_template/config.json
index 3c8fc2da2..40502fa02 100755
--- a/front/plugins/newdev_template/config.json
+++ b/front/plugins/newdev_template/config.json
@@ -261,7 +261,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "All the newly discovered device names are clened up by applying the following REGEX expression in this order. All the below are replaced by a blank string."
+          "string": "All the newly discovered device names are cleaned up by applying the following REGEX expression in this order. All the below are replaced by a blank string."
         }
       ]
     },
diff --git a/server/helper.py b/server/helper.py
index 3239278ad..0625bfd23 100755
--- a/server/helper.py
+++ b/server/helper.py
@@ -808,8 +808,9 @@ def sanitize_string(input):
 
 #-------------------------------------------------------------------------------
 def sanitize_SQL_input(val):
-    val = val.replace("'", '_')
-    return val
+    if val is None:
+        return ''  
+    return val.replace("'", "_")
 
 
 #-------------------------------------------------------------------------------