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

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