Fixing NPE in part event