This shouldn't be needed anymore since null is handled outside now, no?