Add a small fix to preserve error-messages when 'error' is not handled.

Testcases for this are still missing.