Fix: Log NPE in 2978b9f