diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php
index e3dcf5cdd..b3524b7bf 100644
--- a/lib/Doctrine/ORM/Mapping/MappingException.php
+++ b/lib/Doctrine/ORM/Mapping/MappingException.php
@@ -127,4 +127,10 @@ class MappingException extends \Doctrine\ORM\ORMException
         return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
                 . $className . ' since it is referenced by a join column of another class.');
     }
+    
+    public static function annotationDriverRequiresConfiguredDirectoryPath()
+    {
+        return new self('The annotation driver needs to have a directory path');
+    }
+
 }
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
index c3fdd253f..a7b589563 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
@@ -145,7 +145,7 @@ class SchemaToolTask extends AbstractTask
         
         if ($metadataDriver instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) {
             if (isset($arguments['class-dir'])) {
-                $metadataDriver->addPaths($arguments['class-dir']);
+                $metadataDriver->addPaths((array) $arguments['class-dir']);
             } else {
                 throw new CliException(
                     'The supplied configuration uses the annotation metadata driver. ' .