Now catching exceptions. Almost finished
Merge branch 'master' of https://github.com/krsjan/raptor