diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java
index 9326f9e019..530ac4f3bd 100644
--- a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java
+++ b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java
@@ -37,17 +37,18 @@ private void initializeReader() {
             InputStream inputStream = url.openStream();
             reader = factory.createXMLStreamReader( inputStream );
 
-            while (reader.hasNext() && reader.next() != XMLStreamConstants.START_ELEMENT);
+            while ( reader.hasNext() && reader.next() != XMLStreamConstants.START_ELEMENT )
+                ;
             rootElementName = reader.getLocalName();
-            if(!reader.hasNext()) {
+            if ( !reader.hasNext() ) {
                 throw new GenericRuntimeException( "Unexpected end of stream" );
             }
             do {
-                if (!reader.hasNext()) {
+                if ( !reader.hasNext() ) {
                     return;
                 }
                 reader.next();
-            } while (reader.getEventType() != XMLStreamConstants.START_ELEMENT );
+            } while ( reader.getEventType() != XMLStreamConstants.START_ELEMENT );
         } catch ( XMLStreamException | IOException e ) {
             throw new GenericRuntimeException( "Error initializing XML reader: " + e.getMessage(), e );
         }
@@ -66,23 +67,22 @@ public boolean moveNext() {
             String documentOuterName = reader.getLocalName();
             reader.next();
             current = new PolyValue[]{ converter.toPolyDocument( reader, documentOuterName ) };
-            if (!reader.hasNext() ) {
+            if ( !reader.hasNext() ) {
                 return false;
             }
-            if (reader.next() == XMLStreamConstants.END_ELEMENT && rootElementName.equals( reader.getLocalName())) {
+            if ( reader.next() == XMLStreamConstants.END_ELEMENT && rootElementName.equals( reader.getLocalName() ) ) {
                 return false;
             }
-            while (reader.getEventType() != XMLStreamConstants.START_ELEMENT ) {
-                if (!reader.hasNext()) {
+            while ( reader.getEventType() != XMLStreamConstants.START_ELEMENT ) {
+                if ( !reader.hasNext() ) {
                     return false;
                 }
                 reader.next();
             }
             return true;
         } catch ( XMLStreamException | DecoderException e ) {
-            throw new RuntimeException( "Filed to get next document.", e );
+            throw new GenericRuntimeException( "Filed to get next document.", e );
         }
-
     }
 
 
diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java
index 6b9ebae278..a4068e7723 100644
--- a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java
+++ b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java
@@ -15,6 +15,7 @@
 import javax.xml.stream.XMLStreamReader;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
+import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.type.entity.PolyBinary;
 import org.polypheny.db.type.entity.PolyBoolean;
 import org.polypheny.db.type.entity.PolyList;
@@ -114,7 +115,7 @@ public PolyValue toPolyValue( XMLStreamReader reader ) throws XMLStreamException
                 yield new PolyBinary( hexBinaryData, hexBinaryData.length );
             }
             case "string" -> new PolyString( value );
-            default -> throw new RuntimeException( "Illegal type encountered: " + typeName );
+            default -> throw new GenericRuntimeException( "Illegal type encountered: " + typeName );
         };
     }