Issue #725: Prevent NPE log