Fixed dripping faucet bug, better error handling