diff --git a/pom.xml b/pom.xml
index 80ebc590fde..1a7432a0a8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>mybatis</artifactId>
-  <version>3.5.11.4</version>
+  <version>3.5.11.5</version>
   <packaging>jar</packaging>
 
   <name>mybatis</name>
diff --git a/src/main/java/org/apache/ibatis/executor/CachingExecutor.java b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
index 66f7fa0c737..c56e0020971 100644
--- a/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
+++ b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
@@ -106,7 +106,7 @@ public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds r
 					list = (List<E>)((UpperCaseMapResultHandler)resultHandler).getResultList();
 				}
 				tcm.putObject(cache, key, list); // issue #578 and #116
-			}else {
+			}else if(resultHandler != null && resultHandler instanceof UpperCaseMapResultHandler){
 				UpperCaseMapResultHandler handler = (UpperCaseMapResultHandler)resultHandler;
 				handler.setResultList((List<Object>)list);
 				handler.setFromCache(true);