In other words, I think it's better to standardize on NPE for this use case, and I like consistency with ORM.
BTW this is an internal API and really that check is mostly pointless unless we code something wrong in the future.