Prevent NPE for null features