Yes, except the bit about the upgraded charge. It was perfectly valid, and a serious crime, just very poorly explained. Which gets to the real problem: the combination of people in charge of enforcing consequences don't have the proper incentives to do so; and a criminal willing to resort to violence.