Fix crash when bad HTTP credentials are provided
integration mainline->db-changes