Adding more info to NullParameterException
Updates to URL Encoding
Fix to tests