Comment 1 for bug 905204

If anyone is willing to test this branch or apply it to the current trunk and test it, that would be great. We need to know if this properly catches the bad response and if using the retry button works.