#311 - NPE guard