Fix: prevent NPE