Stuffing around with errors
Merge branch 'config' of github.com:skorks/escort into config
Better handle on errors

Error handling is a bit better and nested errors working