add condition into notNull.js