More intelligent handling of 4xx codes