Error handling cleanup 2.