Only query PackageList when pkgHandle not set
Merge pull request #1806 from raphaelstolt/patch-1

Only query PackageList when pkgHandle not set