Re-introduce error detection on new functions