Merge "[Bugfix]fix NullPointException when pkg is null"