Fix pump crash
Merge pull request #1852 from Prototik/pump-drain-crash

Fix pump crash