Tweaked authorization, error handling and reporting