Fix bug relating to help entry aliases

If no help entry with alias exists, parsing would fail.
Merge branch 'help' into develop