Extended the checks in 'new' and 'create', per dkf's suggestion