From 655cbb94409770c0c163d1be513e03c3eb259e01 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Wed, 2 Mar 2011 20:42:43 +0200
Subject: [PATCH] improve failure when disabling dynamic creating of types, and
 trying to index into a non existing type

---
 .../main/java/org/elasticsearch/index/mapper/MapperService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index c11e404b187..04bcfc10c14 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -223,7 +223,7 @@ public class MapperService extends AbstractIndexComponent implements Iterable<Do
             return mapper;
         }
         if (!dynamic) {
-            return null;
+            throw new TypeMissingException(index, type, "typing to auto create mapping, but dynamic mapping is disabled");
         }
         // go ahead and dynamically create it
         synchronized (mutex) {