Returning the correct http status in case of unhandled exception
Merge pull request #1980 from abhgupta/abhgupta-dev

Merged by openshift-bot