Try to improve OAuth errors handling