Prevent NPEs in Remove, fixes #455