diff --git a/src/lib/application.ts b/src/lib/application.ts
index 7bdfdc5b8..f82c9ce0b 100644
--- a/src/lib/application.ts
+++ b/src/lib/application.ts
@@ -272,7 +272,7 @@ export class Application extends ChildableComponent<Application, AbstractCompone
             file = Path.resolve(file);
             if (FS.statSync(file).isDirectory()) {
                 add(file);
-            } else if (exclude && !exclude.match(file)) {
+            } else if (!exclude || !exclude.match(file)) {
                 files.push(file);
             }
         });
diff --git a/test/typedoc.js b/test/typedoc.js
index f1f59f430..af64be87f 100644
--- a/test/typedoc.js
+++ b/test/typedoc.js
@@ -9,14 +9,20 @@ describe('TypeDoc', function() {
         it('constructs', function() {
             application = new TypeDoc.Application();
         });
-        it('expands input files', function() {
+        it('expands input directory', function() {
             var inputFiles = Path.join(__dirname, 'converter', 'class');
             var expanded = application.expandInputFiles([inputFiles]);
 
             Assert.notEqual(expanded.indexOf(Path.join(inputFiles, 'class.ts')), -1);
             Assert.equal(expanded.indexOf(inputFiles), -1);
         });
-        it('honors the exclude argument even on a fixed file list', function() {
+        it('expands input files', function() {
+            var inputFiles = Path.join(__dirname, 'converter', 'class', 'class.ts');
+            var expanded = application.expandInputFiles([inputFiles]);
+
+            Assert.notEqual(expanded.indexOf(inputFiles), -1);
+        });
+        it('honors the exclude argument even on a fixed directory list', function() {
             var inputFiles = Path.join(__dirname, 'converter', 'class');
             application.options.setValue('exclude', '**/class.ts');
             var expanded = application.expandInputFiles([inputFiles]);
@@ -24,6 +30,13 @@ describe('TypeDoc', function() {
             Assert.equal(expanded.indexOf(Path.join(inputFiles, 'class.ts')), -1);
             Assert.equal(expanded.indexOf(inputFiles), -1);
         });
+        it('honors the exclude argument even on a fixed file list', function() {
+            var inputFiles = Path.join(__dirname, 'converter', 'class', 'class.ts');
+            application.options.setValue('exclude', '**/class.ts');
+            var expanded = application.expandInputFiles([inputFiles]);
+
+            Assert.equal(expanded.indexOf(inputFiles), -1);
+        });
         it('supports multiple excludes', function() {
             var inputFiles = Path.join(__dirname, 'converter');
             application.options.setValue('exclude', '**/+(class|access).ts');