Merge "Better exceptions around provider permissions."