Sometimes, drinking too fast does cause them to cough or snort. If this concerns you, I'm thinking a water bottle converter might do the trick. There was a tread about the converters not too long ago.. here's the thread.
http://www.yorkietalk.com/forums/yor...onverters.html