CID-1254833 refactor condition to include null-case
Fix for potential NPE
Package name should reflect the location on the filesystem or viseversa