Updated additional legacy $NULL checks to check for empty variable
instead.