Build fix & gracefull handeling of unathorized exception