Improve error handling

Signed-off-by: Michael Buesch <m@bues.ch>