diff --git a/java/pom.xml b/java/pom.xml
index 25801d15..c8a19b3a 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.msgpack</groupId>
   <artifactId>msgpack</artifactId>
-  <version>0.5.0-devel</version>
+  <version>0.5.1-devel</version>
   <description>MessagePack for Java</description>
 
   <name>MessagePack for Java</name>
diff --git a/java/src/main/java/org/msgpack/template/TemplateBuilder.java b/java/src/main/java/org/msgpack/template/TemplateBuilder.java
index c77a4338..e3d25b29 100644
--- a/java/src/main/java/org/msgpack/template/TemplateBuilder.java
+++ b/java/src/main/java/org/msgpack/template/TemplateBuilder.java
@@ -149,7 +149,11 @@ public abstract class TemplateBuilder {
 				baseType = ((GenericArrayType)baseType).getGenericComponentType();
 				dim += 1;
 			}
-			baseClass = (Class<?>)((ParameterizedType)baseType).getRawType();
+			if(baseType instanceof ParameterizedType) {
+				baseClass = (Class<?>)((ParameterizedType)baseType).getRawType();
+			} else {
+				baseClass = (Class<?>)baseType;
+			}
 		} else {
 			Class<?> type = (Class<?>)arrayType;
 			baseClass = type.getComponentType();