diff --git a/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java b/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java
index 7a46c134..763e90ec 100644
--- a/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java
+++ b/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java
@@ -147,7 +147,10 @@ private void resolveType(final TypeDefinition<? extends TypeDefinition<?>> type,
         final TypeDefinition<?> rootType = getRootType(type);
         final String rootLocalName = rootType.getQName().getLocalName();
         if (!Objects.equals(rootLocalName, type.getQName().getLocalName()) && !rootLocalName.equals("boolean")) {
-            final QNameModule mod = QNameModule.create(type.getQName().getNamespace(), type.getQName().getRevision());
+            final QNameModule mod = type.getQName().getRevision().isPresent()
+                ? QNameModule.of(type.getQName().getNamespace(), type.getQName().getRevision().get())
+                : QNameModule.of(type.getQName().getNamespace());
+
             usedImportedTypeDefs.computeIfAbsent(mod, k -> new TreeSet<>(Comparator.comparing(SchemaNode::getQName)))
                     .add(type);
             usedImports.computeIfAbsent(module.getQNameModule(), k -> new HashSet<>())