Fixed bug - NPE in postconstruct