Removed cause of NPE