Well, that was unfortunate to have happen in front of you, especially with all your fears. No wonder you've been on edge with this. I would tend to trust what he told you is his protocol in a crisis, which does not sound knee jerk. As for his comment about the baker act, I would tell myself that I have no idea what the circumstances are that the other person is dealing with.

Also, if you have the chance, maybe tell him that comment he made in front of you was alarming and you worry he'll do that to you. It could be a chance to meet your fear head on; that is, unless you've already been that direct with him (which is sounds like you have with the above reply of his). If it were me, I'd say what was that all about and am I going to have to worry about that with you? But that's me. I like to clear the air right away or I will stew and suffer.