Prevent NPE - issue #105