added mockup behaviour to prevent NPE