Cleaned up exception handling and fixed Enabled attribute in manifest.mf files.