Avoid npe on attempt to remove non-existing parameter