Fixing bad merge in Exception.php