Handle NullPointerExceptions related to package persistence
Merge pull request #27 from adeven/development

Handle NullPointerExceptions related to package persistence