fix bug serengeti-1810 - NPE issue