Cleanup
Fixed NPE when pump has no fill target