Sick with those (not null and not empty) tests everywhere