Prevent NPE in #2