Merge "Raise a NoManifestException when the manifest DNE"