diff --git a/CategoryTree.alias.php b/CategoryTree.alias.php
index acaf1047..6c5c8d53 100644
--- a/CategoryTree.alias.php
+++ b/CategoryTree.alias.php
@@ -485,4 +485,4 @@ $specialPageAliases['zh-hant'] = array(
 /** Chinese (Taiwan) (中文（台灣）‎) */
 $specialPageAliases['zh-tw'] = array(
 	'CategoryTree' => array( '分類樹' ),
-);
\ No newline at end of file
+);
diff --git a/CategoryTree.i18n.magic.php b/CategoryTree.i18n.magic.php
index bf11ae19..44df1931 100644
--- a/CategoryTree.i18n.magic.php
+++ b/CategoryTree.i18n.magic.php
@@ -249,4 +249,4 @@ $magicWords['zh-hans'] = array(
 /** Traditional Chinese (中文（繁體）‎) */
 $magicWords['zh-hant'] = array(
 	'categorytree' => array( 0, '分類樹' ),
-);
\ No newline at end of file
+);
diff --git a/CategoryTreeFunctions.php b/CategoryTreeFunctions.php
index ec7a0e66..05bae2e7 100644
--- a/CategoryTreeFunctions.php
+++ b/CategoryTreeFunctions.php
@@ -242,7 +242,7 @@ class CategoryTree {
 	 * @param $options
 	 * @param $enc
 	 * @return mixed
-	 * @throws MWException
+	 * @throws Exception
 	 */
 	static function encodeOptions( $options, $enc ) {
 		if ( $enc == 'mode' || $enc == '' ) {
@@ -250,7 +250,7 @@ class CategoryTree {
 		} elseif ( $enc == 'json' ) {
 			$opt = FormatJson::encode( $options );
 		} else {
-			throw new MWException( 'Unknown encoding for CategoryTree options: ' . $enc );
+			throw new Exception( 'Unknown encoding for CategoryTree options: ' . $enc );
 		}
 
 		return $opt;
@@ -260,7 +260,7 @@ class CategoryTree {
 	 * @param $options
 	 * @param $enc
 	 * @return array|mixed
-	 * @throws MWException
+	 * @throws Exception
 	 */
 	static function decodeOptions( $options, $enc ) {
 		if ( $enc == 'mode' || $enc == '' ) {
@@ -268,11 +268,11 @@ class CategoryTree {
 		} elseif ( $enc == 'json' ) {
 			$opt = FormatJson::decode( $options );
 			if ( !$opt ) {
-				throw new MWException( 'JSON cannot decode CategoryTree options' );
+				throw new Exception( 'JSON cannot decode CategoryTree options' );
 			}
 			$opt = get_object_vars( $opt );
 		} else {
-			throw new MWException( 'Unknown encoding for CategoryTree options: ' . $enc );
+			throw new Exception( 'Unknown encoding for CategoryTree options: ' . $enc );
 		}
 
 		return $opt;