Double QUERY_STRING in error URL

if the script raises an exception has url like
http://www.domain.com/path/to/my/script.html?foo=bar

HTTP_HOST = www.domain.com
REQUEST_URI = /path/to/my/script.html?foo=bar
QUERY_STRING = ?foo=bar

REQUEST_URI already contains QUERY_STRING.
Reported URL is wrong: http://www.domain.com/path/to/my/script.html?foo=bar?foo=bar

I fix it replacing REQUEST_URI with SCRIPT_NAME.
