Remove dummy values from package_dict. Fix discipline. Remove too general exception catch.