Prevent exception when removing a pump