Removed comments no longer needed as per @alexdalitz. Fix handling of an error.