Try to handle 400 response better