Fix bug 1020954 - Don't crash when URL is a 404
2.0.127
2.0.128
2.0.129
2.0.130
2.1.0
Merge tag 'v2.1.0'

2.1.0
fix #1027083 Update update params