Removing last artifact of error handling