Fix division by zero on boot, add return null