Add isNull() and fix isEmpty()