Tried to send you a PM GIJEW, your inbox is full..
It's fun seeing this plot thicken!
2 'nitpicks':
1)No need to disengage the safety on an M9 to clear the chamber.
2)I think "Mr Johns" being indignant would be more plausible if it was a case of "Dubois" being detained because staff spotted his pistol instead of finding him drunk and unconcious with it by the swimming pool--that and his wife not being informed of his whereabouts