Error-handling for the last commit.

Test-phase finished.
Ready to split.