Fixed source of NPE