better authorization errors handling, COLT-276, random minor improvements