Merge branch 'api_exception_handling' of https://bitbucket.org/aksinhanerd/auth into api_exception_handling

Author: aksinha-nerdapplabs