stricter checking for null values