Fix bug X

Here's where you can write a whole book on the motivation behind your
commit and why someone merge it.
Without this patch, software will crash under these condition...