Prevent NPE from #41