Prevent NPE for #534