Treat HTTP status 400/413 specially

Change-Id: If82c582ad601a3225b157ab69d993e2c5a27cdbb