Removing obsolete error handling