Re-apply error checking