Error handling
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild