BZ 1138805 - NPE check