Merge #658 - Avoid using a null alias as an array offset in getAliases()

Merge #658 - Avoid using a null alias as an array offset in getAliases() #1165