What's the best way to prevent spilling the tea?

When I drink yerba mate I often spill it accidentally because I hit the bombilla. Are there any spill proof options out there?