Return error to client when an invalid scope is requested
Merge branch 'smart-launch' into self-service