Fixed the test -z so it could process null values correct.