Bugfixing NPE