More work on error-handling.