#734 - Fix NPEs relating to typeahead for Skus