Merge branch 'V5-6-patches' into V5-7-patches

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