Improves handling of error instances