Added some error trapping to try and understand this auth edge case