diff --git a/URLTEST b/URLTEST
index 4f6c2cf200fcb3c8b3d84cf356df3a89a147eb31..6b49d0ce2dcd8751a456e8bea8630fb904946634 100755
Binary files a/URLTEST and b/URLTEST differ
diff --git a/shared/url.h b/shared/url.h
index ea3b18c91f213a4434e300d0ef76a9b4902587be..2258a1127070bdd0d3f6932ba2e07c9fcd831a05 100644
--- a/shared/url.h
+++ b/shared/url.h
@@ -124,7 +124,8 @@ public:
 					CompleteUrl = string(temp_CompleteUrl, strlen(temp_CompleteUrl));
 					//remove question marks
 					size_t found = CompleteUrl.find("?");
-					CompleteUrl.erase(found, CompleteUrl.size( ));
+					if(found < CompleteUrl.size( ) )
+						CompleteUrl.erase(found, CompleteUrl.size( ));
 
 					Service = string(temp_Service, strlen(temp_Service));
 					Host = string(temp_Host, strlen(temp_Host));