Removed error wrapper