Make carrying guns into jail booking/cell areas arrestable. If the suspect gets a gun, the officer should be charged with supplying commission of a felony