Basic error handling has been introduced. Fixes bug#1267052