Pump: add null assertions