To fix it I would have locked rotation on the X and Z axes so it wouldn't spin around in your hand
That is a pretty good idea. But it also comes with its negatives.