Replaced return value with CHECKNP.