Yeah,he was in the right. I have a gunshop and I am ruthless about safety. A friend of mine was being neglectfully unsafe one day and pointed a revolver at me a few times while admiring it. After leaning and trying to keep from looking down it a few time I finally told him “If you point that thing at me one more time I am gonna holster it in your ass”. He was a bit embarrassed but he got over it and has been careful ever since.
I learned safety from my father, and you are a whole lot more gentle than he was. The extra punishment for a first violation was a year without touching firearms, and he was nowhere near as gentle with his warnings as you were (but it was not a business for him, so he didn't have to be tolerant).
I am anal about firearm handling in a gunstore. Whenever I look over a gun, the first thing I do is verify it is unloaded. When handing it back I always:
I do not take chances. I want the person I am handing it to to be able to see it is still unloaded.
I was in a coin store once and the owner wanted to show me 25 caliber pistol that he was trying to sell. I opened the action and it was loaded. He said that one of his employees must have loaded it.
I was at the gun range awhile back and a police officer was in there trying to get a laser sight mounted on his pistol. He swept the room with the barrel several times. He laughed at the rest of us who were trying to avoid having the muzzle pointed at us.