Revert "Better handling of the error..." Pushed to wrong branch. Sorry.

This reverts commit 9f1c0dfe81856b166c5d94489bb53995be7bb3c2.