Made error-handling less special.