--- pyrenamer_filefuncs.py_bak	2014-12-23 23:48:25.320876834 +0000
+++ pyrenamer_filefuncs.py	2014-12-23 23:48:34.000870902 +0000
@@ -460,6 +460,9 @@
     if cameramodel != None: newname = newname.replace('{cameramodel}', cameramodel)
     else: newname = newname.replace('{cameramodel}', '')
 
+    if newname == "None":
+        return None, None
+
     # Returns new name and path
     newpath = get_new_path(newname, path)
     return unicode(newname), unicode(newpath)