diff --git a/HandBrakeCluster/Exceptions.class.php b/HandBrakeCluster/Exceptions.class.php
index 5bd80d9..e900b63 100644
--- a/HandBrakeCluster/Exceptions.class.php
+++ b/HandBrakeCluster/Exceptions.class.php
@@ -2,13 +2,15 @@
 
 class HandBrakeCluster_Exception extends Exception {};
 
-class HandBrakeCluster_Exception_DatabaseConfigMissing  extends HandBrakeCluster_Exception {};
-class HandBrakeCluster_Exception_DatabaseConnectFailed  extends HandBrakeCluster_Exception {};
-class HandBrakeCluster_Exception_NoDatabaseConnection   extends HandBrakeCluster_Exception {};
-class HandBrakeCluster_Exception_DatabaseQueryFailed    extends HandBrakeCluster_Exception {};
-class HandBrakeCluster_Exception_ResultCountMismatch    extends HandBrakeCluster_Exception {};
+class HandBrakeCluster_Exception_DatabaseException      extends HandBrakeCluster_Exception {};
+class HandBrakeCluster_Exception_DatabaseConfigMissing  extends HandBrakeCluster_Exception_DatabaseException {};
+class HandBrakeCluster_Exception_DatabaseConnectFailed  extends HandBrakeCluster_Exception_DatabaseException {};
+class HandBrakeCluster_Exception_NoDatabaseConnection   extends HandBrakeCluster_Exception_DatabaseException {};
+class HandBrakeCluster_Exception_DatabaseQueryFailed    extends HandBrakeCluster_Exception_DatabaseException {};
+class HandBrakeCluster_Exception_ResultCountMismatch    extends HandBrakeCluster_Exception_DatabaseException {};
 
-class HandBrakeCluster_Exception_UnknownSetting         extends HandBrakeCluster_Exception {};
+class HandBrakeCluster_Exception_ConfigException        extends HandBrakeCluster_Exception {};
+class HandBrakeCluster_Exception_UnknownSetting         extends HandBrakeCluster_Exception_ConfigException {};
 
 class HandBrakeCluster_Exception_TemplateException      extends HandBrakeCluster_Exception {};
 class HandBrakeCluster_Exception_Unauthorized           extends HandBrakeCluster_Exception_TemplateException {};
@@ -16,4 +18,8 @@ class HandBrakeCluster_Exception_FileNotFound           extends HandBrakeCluster
 
 class HandBrakeCluster_Exception_InvalidSourceDirectory extends HandBrakeCluster_Exception {};
 
+class HandBrakeCluster_Exception_CacheException         extends HandBrakeCluster_Exception {};
+class HandBrakeCluster_Exception_InvalidCacheDir        extends HandBrakeCluster_Exception_CacheException {};
+class HandBrakeCluster_Exception_CacheObjectNotFound    extends HandBrakeCluster_Exception_CacheException {};
+
 ?>
\ No newline at end of file