diff --git a/modules/converter/src/main/scala/es/weso/shacl/converter/Shacl2ShEx.scala b/modules/converter/src/main/scala/es/weso/shacl/converter/Shacl2ShEx.scala
index 7fb237d3..044067f0 100644
--- a/modules/converter/src/main/scala/es/weso/shacl/converter/Shacl2ShEx.scala
+++ b/modules/converter/src/main/scala/es/weso/shacl/converter/Shacl2ShEx.scala
@@ -204,11 +204,11 @@ object Shacl2ShEx extends LazyLogging {
   case class PredicateInverse(pred: IRI, inverse: Option[Boolean])
 
   private def getMinComponent(components: List[shacl.Component]): Result[Option[Int]] = {
-    ok(components.collect { case shacl.MinCount(m) => m }.headOption)
+    ok(Some(components.collect { case shacl.MinCount(m) => m }.headOption.getOrElse(0)))
   }
 
   private def getMaxComponent(components: List[shacl.Component]): Result[Option[shex.Max]] = {
-    ok(components.collect { case shacl.MaxCount(m) => shex.IntMax(m) }.headOption)
+    ok(Some(components.collect { case shacl.MaxCount(m) => shex.IntMax(m) }.headOption.getOrElse(shex.Star)))
   }
 
   // TODO: Conversion of components like BlankNodeOrIRI is ignored by now