Fix error handling

Signed-off-by: Michal Čihař <michal@cihar.com>
Merge branch 'master' into bootstrap