Added a fix for null package names.