Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  If the asp lookup returns NULL, don't try to use it