Index: src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
===================================================================
--- src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java	(revision 760479)
+++ src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java	(working copy)
@@ -308,7 +308,12 @@
                 }
             }
             if (contentNode == null) {
-                contentNode = parentNode.addNode(JcrConstants.JCR_CONTENT, getContentNodeType());
+                if (parentNode.getPrimaryNodeType().canAddChildNode(JcrConstants.JCR_CONTENT)) {
+                    contentNode = parentNode.addNode(JcrConstants.JCR_CONTENT);
+                }
+                else {
+                    contentNode = parentNode.addNode(JcrConstants.JCR_CONTENT, getContentNodeType());
+                }
             }
         }
         return contentNode;