Overhaul error handling
Merge branch 'master' of github.com:mschae/rabbithole