adding some exception handling for the api controller
Merge branch 'master' of github.com:pushysocket/site