Fix for potential NPE
Package name should reflect the location on the filesystem or viseversa