Removed broken error handling