Absolutely not; it was providential that he was able to retrieve his weapon and return fire, and all should be thankful for that. The question is how to move forward now that a vulnerability has been exploited and exposed, and my preference is for all hands to train as they would deploy by drawing and carrying their T/O weapons while accomplishing their regular tasks.
The SIG-Sauer P239 is standard issue for NCIS and other Fed agencies.
The SIG-Sauer P228 is also known as the M11 ...
Either of these weapons would be fine for stateside sidearms
And they’re “uniform”.