Merge branch 'master' into Experimental

Author: tcstool

README.md

@@ -1,7 +1,7 @@
 NoSQLMap 
 ========
 
-[NoSQLMap](http://www.nosqlmap.net) v0.15
+[NoSQLMap](http://www.nosqlmap.net) v0.15b
 
 Introduction
 ============

nosqlmap.py

@@ -35,7 +35,7 @@ def mainMenu():
 	while select:
 		os.system('clear')
 		#label = subprocess.check_output(["git","describe","--always"])
-		print "NoSQLMap-v0.15a"
+		print "NoSQLMap-v0.15b"
 		print "nosqlmap@gmail.com"
 		print "\n"
 		print "1-Set options (do this first)"
@@ -686,9 +686,14 @@ def buildUri(origUri, randValue):
 	injOpt = ""
 
 	#Split the string between the path and parameters, and then split each parameter
-	split_uri = origUri.split("?")
-	params = split_uri[1].split("&")
+	try:
+		split_uri = origUri.split("?")
+		params = split_uri[1].split("&")
 
+	except:
+		raw_input("Not able to parse the URL and parameters.  Check options settings.  Press enter to return to main menu...")
+		mainMenu()
+		
 	for item in params:
 		index = item.find("=")
 		paramName.append(item[0:index])