diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java
index 696dfbbc3e..8820b83db7 100644
--- a/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java
+++ b/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -69,6 +69,7 @@
 import com.oracle.javafx.scenebuilder.kit.editor.selection.AbstractSelectionGroup;
 import com.oracle.javafx.scenebuilder.kit.editor.selection.ObjectSelectionGroup;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument;
+import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMNodes;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMObject;
 import com.oracle.javafx.scenebuilder.kit.library.Library;
@@ -98,6 +99,7 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -125,6 +127,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
@@ -409,7 +412,11 @@ public SplitController getDocumentSplitController() {
     public void loadFromFile(File fxmlFile) throws IOException {
         final URL fxmlURL = fxmlFile.toURI().toURL();
         final String fxmlText = FXOMDocument.readContentFromURL(fxmlURL);
-        editorController.setFxmlTextAndLocation(fxmlText, fxmlURL, false);
+        
+        FXOMDocumentSwitch[] options = FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS
+                                                         .fromToggle(getPreferencesRecordGlobal().isPreserveUnresolvedImports());
+
+        editorController.setFxmlTextAndLocation(fxmlText, fxmlURL, false, options);
         updateLoadFileTime();
         updateStageTitle(); // No-op if fxml has not been loaded yet
         updateFromDocumentPreferences(true);
@@ -2362,6 +2369,37 @@ private PreferencesRecordGlobal getPreferencesRecordGlobal() {
         }
         return recordGlobal;
     }
+
+    public void showMissingTypesNotificationIfNeeded(File fxmlFile) {
+        FXOMDocument doc = getEditorController().getFxomDocument();
+        if (doc.hasUnresolvableTypes()) {
+            notifyUserAboutUnresolvableImports(fxmlFile, doc.getUnresolvableTypes(), getStage());
+        }
+    }
+    
+    private void notifyUserAboutUnresolvableImports(File fxmlFile, List<String> missingTypes, Stage owner) {
+        LOGGER.log(Level.WARNING, "Detected unresolved types in FXML: {0}: {1}",
+                               new Object[] {fxmlFile, String.join(",", missingTypes) });
+
+        final ErrorDialog errorDialog = new ErrorDialog(owner);
+        String first10 = missingTypes.stream()
+                                     .limit(10)
+                                     .collect(Collectors.joining(";" + System.lineSeparator()));
+
+        errorDialog.setMessage(I18N.getString("alert.open.failure.unresolved.imports",
+                               Integer.toString(missingTypes.size())));
+        errorDialog.setDetails(I18N.getString("alert.open.failure.unresolved.imports.details", first10));
+        errorDialog.setDetailsTitle(I18N.getString("alert.open.failure.unresolved.imports",
+                                    Integer.toString(missingTypes.size())));
+
+        String allMissing = missingTypes.stream()
+                                        .collect(Collectors.joining(";" + System.lineSeparator()));
+
+        errorDialog.setDebugInfo(I18N.getString("alert.open.failure.unresolved.imports.advice",
+                                 allMissing, missingTypes.size()));
+        errorDialog.setTitle(I18N.getString("alert.title.open") + ": " + fxmlFile.getName());
+        errorDialog.showAndWait();
+    }
 }
 
 ///**
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java
index 99033c5f7f..befd604bd6 100644
--- a/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java
+++ b/app/src/main/java/com/oracle/javafx/scenebuilder/app/SceneBuilderApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -740,6 +740,7 @@ private void performOpenFiles(List<File> fxmlFiles, Consumer<Map<File, Exception
                     hostWindow.openWindow();
                     openedFiles.add(fxmlFile);
                     LOGGER.log(Level.INFO, "Successfully opened file {0}", fxmlFile);
+                    hostWindow.showMissingTypesNotificationIfNeeded(fxmlFile);
                 }
             } catch (Exception xx) {
                 LOGGER.log(Level.WARNING, "Failed to open file: %s".formatted(fxmlFile), xx);
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesRecordGlobal.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesRecordGlobal.java
index afc7a758c0..9bf05bfa18 100644
--- a/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesRecordGlobal.java
+++ b/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesRecordGlobal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -101,6 +101,7 @@ public String toString() {
     static final boolean DEFAULT_ACCORDION_ANIMATION = true;
     static final boolean DEFAULT_WILDCARD_IMPORTS = false;
     static final boolean DEFAULT_ALTERNATE_TEXT_INPUT_PASTE = EditorPlatform.IS_MAC;
+    static final boolean DEFAULT_PRESERVE_UNRESOLVED_IMPORTS = true;
 
     static final EditorPlatform.Theme DEFAULT_GLUON_SWATCH = GluonEditorPlatform.DEFAULT_GLUON_SWATCH;
     static final EditorPlatform.Theme DEFAULT_GLUON_THEME = GluonEditorPlatform.DEFAULT_GLUON_THEME;
@@ -121,6 +122,7 @@ public String toString() {
     private int recentItemsSize = DEFAULT_RECENT_ITEMS_SIZE;
     private boolean accordionAnimation = DEFAULT_ACCORDION_ANIMATION;
     private boolean wildcardImports = DEFAULT_WILDCARD_IMPORTS;
+    private boolean preserveUnresolvedImports = DEFAULT_PRESERVE_UNRESOLVED_IMPORTS;
     private final List<String> recentItems = new ArrayList<>();
 
     private LocalDate showUpdateDialogDate = null;
@@ -400,6 +402,14 @@ public void setWildcardImports(boolean wildcardImports) {
         this.wildcardImports = wildcardImports;
     }
 
+    public boolean isPreserveUnresolvedImports() {
+        return preserveUnresolvedImports;
+    }
+
+    public void setPreserveUnresolvedImports(boolean preserveUnresolvedImports) {
+        this.preserveUnresolvedImports = preserveUnresolvedImports;
+    }
+
     public boolean isAlternateTextInputControlPaste() {
         return alternatePasteBehavior;
     }
@@ -501,6 +511,9 @@ public void readFromJavaPreferences() {
         // Wildcard imports
         setWildcardImports(applicationRootPreferences.getBoolean(WILDCARD_IMPORT, DEFAULT_WILDCARD_IMPORTS));
 
+        // Unresolvable Imports
+        setPreserveUnresolvedImports(applicationRootPreferences.getBoolean(PRESERVE_UNRESOLVED_IMPORTS, DEFAULT_PRESERVE_UNRESOLVED_IMPORTS));
+
         // Alternate paste behavior for Text Input Controls
         setAlternateTextInputControlPaste(applicationRootPreferences.getBoolean(ALTERNATE_TEXT_INPUT_PASTE, DEFAULT_ALTERNATE_TEXT_INPUT_PASTE));
     }
@@ -578,6 +591,9 @@ public void writeToJavaPreferences(String key) {
             case ALTERNATE_TEXT_INPUT_PASTE:
                 applicationRootPreferences.putBoolean(ALTERNATE_TEXT_INPUT_PASTE,isAlternateTextInputControlPaste());
                 break;
+            case PRESERVE_UNRESOLVED_IMPORTS:
+                applicationRootPreferences.putBoolean(PRESERVE_UNRESOLVED_IMPORTS, isPreserveUnresolvedImports());
+                break;
             default:
                 super.writeToJavaPreferences(key);
                 break;
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesWindowController.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesWindowController.java
index 055f17f7c6..56530d9faa 100644
--- a/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesWindowController.java
+++ b/app/src/main/java/com/oracle/javafx/scenebuilder/app/preferences/PreferencesWindowController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -55,6 +55,7 @@
 import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.TOOL_THEME;
 import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.WILDCARD_IMPORT;
 import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.ALTERNATE_TEXT_INPUT_PASTE;
+import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.PRESERVE_UNRESOLVED_IMPORTS;
 
 import static com.oracle.javafx.scenebuilder.kit.preferences.PreferencesRecordGlobalBase.DEFAULT_ALIGNMENT_GUIDES_COLOR;
 import static com.oracle.javafx.scenebuilder.kit.preferences.PreferencesRecordGlobalBase.DEFAULT_BACKGROUND_IMAGE;
@@ -143,6 +144,8 @@ public class PreferencesWindowController extends AbstractFxmlWindowController {
     @FXML
     private CheckBox wildcardImports;
     @FXML
+    private CheckBox preserveUnresolvedImports;
+    @FXML
     private CheckBox alternatePasteBehavior;
     @FXML
     private Label alternatePasteBehaviorLabel;
@@ -265,6 +268,10 @@ protected void controllerDidLoadFxml() {
         // Wildcard Imports
         wildcardImports.setSelected(recordGlobal.isWildcardImports());
         wildcardImports.selectedProperty().addListener(new WildcardImportListener());
+        
+        // Unresolvable Imports
+        preserveUnresolvedImports.setSelected(recordGlobal.isPreserveUnresolvedImports());
+        preserveUnresolvedImports.selectedProperty().addListener(new PreserveUnresolvedImportListener());
 
         if (EditorPlatform.IS_MAC) {
             // Alternate paste behavior for Text Input Controls
@@ -594,6 +601,17 @@ public void changed(ObservableValue<? extends Boolean> observable, Boolean oldVa
         }
     }
 
+    private static class PreserveUnresolvedImportListener implements ChangeListener<Boolean> {
+
+        @Override
+        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+            final PreferencesController preferencesController = PreferencesController.getSingleton();
+            final PreferencesRecordGlobal recordGlobal = preferencesController.getRecordGlobal();
+            recordGlobal.setPreserveUnresolvedImports(newValue);
+            recordGlobal.writeToJavaPreferences(PRESERVE_UNRESOLVED_IMPORTS);
+        }
+    }
+
     private static class AlternatePasteListener implements ChangeListener<Boolean> {
 
         @Override
diff --git a/app/src/main/resources/com/oracle/javafx/scenebuilder/app/i18n/SceneBuilderApp.properties b/app/src/main/resources/com/oracle/javafx/scenebuilder/app/i18n/SceneBuilderApp.properties
index b3f4b97ace..e9ed19ebe2 100644
--- a/app/src/main/resources/com/oracle/javafx/scenebuilder/app/i18n/SceneBuilderApp.properties
+++ b/app/src/main/resources/com/oracle/javafx/scenebuilder/app/i18n/SceneBuilderApp.properties
@@ -250,6 +250,7 @@ prefs.cssanalyzer.columns.defaults.last = "Defaults" Column Last
 prefs.recent.items = Recent items :
 prefs.animate.accordion = Animate Accordion :
 prefs.wildcard.import = Use Wildcard Imports :
+prefs.preserve.unresolved.import = Load FXML with unresolved imports:
 prefs.tic.paste.alternate.behavior = Alternative paste behavior for text input :
 prefs.tic.paste.alternate.behavior.tooltip = MacOS only: Enables workaround for pasting into text input controls.\nDisable when pasting text is not working as expected. 
 prefs.reset.default = Reset to Builtin Default Values
@@ -431,12 +432,15 @@ alert.save.noextension.savewith = Save with '.fxml'
 alert.save.noextension.savewithout = Save without '.fxml'
 alert.open.failure.charset.not.found = The given charset could not be set.
 alert.open.failure.charset.not.found.details = It may be due to the encoding in your document.
+alert.open.failure.unresolved.imports = Failed to resolve {0} FXML import(s):
+alert.open.failure.unresolved.imports.details = Use Show Details to obtain a full list of unresolveable imports:\n\n{0}\n\nScene Builder will open the FXML for editing but the custom content will not be rendered correctly.\n\nUnresolved UI elements will be removed from FXML when the file is saved.\n\nPlease add the missing components to your user library within the JAR/FXML Manager. If individual class files are used, make sure those are organized in a directory structure matching the package structure.\n\n
+alert.open.failure.unresolved.imports.advice = Please add the missing components to your user library within the JAR/FXML Manager.\nIf individual class files are used, make sure those are organized in a directory structure matching the package structure.\n\n{0}\n\nA total of {1} unresolvable import(s) was found.\n
 alert.welcome.file.not.found.question = One or more project files were not found.
 alert.welcome.file.not.found.message = If those are located on a removable or network drive, please make sure the drive is connected.\n\n
 alert.welcome.file.not.found.title = Project file(s) not found
 alert.welcome.file.not.found.okay  = Remove From List
 alert.welcome.file.not.found.no = OK
-  
+
 # -----------------------------------------------------------------------------
 # Log Messages
 # -----------------------------------------------------------------------------
diff --git a/app/src/main/resources/com/oracle/javafx/scenebuilder/app/preferences/Preferences.fxml b/app/src/main/resources/com/oracle/javafx/scenebuilder/app/preferences/Preferences.fxml
index 23af4ca44e..a4508d4ad6 100644
--- a/app/src/main/resources/com/oracle/javafx/scenebuilder/app/preferences/Preferences.fxml
+++ b/app/src/main/resources/com/oracle/javafx/scenebuilder/app/preferences/Preferences.fxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  Copyright (c) 2016, 2019, Gluon and/or its affiliates.
+  Copyright (c) 2016, 2025, Gluon and/or its affiliates.
   Copyright (c) 2012, 2014, Oracle and/or its affiliates.
   All rights reserved. Use is subject to license terms.
 
@@ -50,7 +50,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.shape.Rectangle?>
 
-<GridPane hgap="6.0" maxWidth="1.7976931348623157E308" styleClass="theme-presets" vgap="10.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+<GridPane hgap="6.0" maxWidth="1.7976931348623157E308" styleClass="theme-presets" vgap="10.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
   <children>
     <Label text="%prefs.doc.width" GridPane.columnIndex="0" GridPane.rowIndex="0" />
     <DoubleField fx:id="rootContainerWidth" prefWidth="200.0" text="" GridPane.columnIndex="1" GridPane.rowIndex="0" />
@@ -127,11 +127,11 @@
                 <Label text="%prefs.wildcard.import" GridPane.columnIndex="0" GridPane.rowIndex="18" />
     <CheckBox fx:id="wildcardImports" selected="true" GridPane.columnIndex="1" GridPane.rowIndex="18" />
 
-                <Button onAction="#resetToDefaultAction" prefWidth="-1.0" text="%prefs.reset.default" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="21">
+                <Button onAction="#resetToDefaultAction" prefWidth="-1.0" text="%prefs.reset.default" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="22">
          <GridPane.margin>
             <Insets top="-10.0" />
          </GridPane.margin></Button>
-      <GridPane fx:id="alternatePasteBehaviorPane" hgap="5.0" vgap="10.0" GridPane.columnSpan="2" GridPane.rowIndex="20">
+      <GridPane fx:id="alternatePasteBehaviorPane" hgap="5.0" vgap="10.0" GridPane.columnSpan="2" GridPane.rowIndex="21">
         <columnConstraints>
           <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS" percentWidth="50.0" />
           <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" percentWidth="50.0" />
@@ -157,7 +157,9 @@
                </GridPane.margin></Separator>
          </children>
       </GridPane>
-      <Separator layoutX="30.0" layoutY="500.0" prefWidth="-1.0" GridPane.columnSpan="2" GridPane.rowIndex="19" />
+      <Separator layoutX="30.0" layoutY="500.0" prefWidth="-1.0" GridPane.columnSpan="2" GridPane.rowIndex="20" />
+      <Label text="%prefs.preserve.unresolved.import" GridPane.rowIndex="19" />
+      <CheckBox fx:id="preserveUnresolvedImports" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="19" />
   </children>
   <columnConstraints>
     <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" percentWidth="50.0" />
@@ -189,5 +191,6 @@
     <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" vgrow="NEVER" />
     <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" vgrow="NEVER" />
     <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" vgrow="NEVER" />
+    <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" vgrow="NEVER" />
   </rowConstraints>
 </GridPane>
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
index 666f12da17..edbfcabd9a 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/EditorController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2017, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -707,10 +707,11 @@ public void setFxmlTextAndLocation(String fxmlText, URL fxmlLocation) throws IOE
      * @param fxmlLocation null or the location of the fxml text being edited
      * @param checkTheme if set to true a check will be made if the fxml contains
      *                           Gluon controls and if so, the correct theme is set
+     * @param switches Optional switches to configure FXOM and FXML processes
      * @throws IOException if fxml text cannot be parsed and loaded correctly.
      */
-    public void setFxmlTextAndLocation(String fxmlText, URL fxmlLocation, boolean checkTheme) throws IOException {
-        updateFxomDocument(fxmlText, fxmlLocation, getResources(), checkTheme);
+    public void setFxmlTextAndLocation(String fxmlText, URL fxmlLocation, boolean checkTheme, FXOMDocumentSwitch ... switches) throws IOException {
+        updateFxomDocument(fxmlText, fxmlLocation, getResources(), checkTheme, switches);
         this.fxmlLocationProperty.setValue(fxmlLocation);
     }
 
@@ -2513,11 +2514,12 @@ private boolean isSelectionControl() {
         return true;
     }
 
-    private void updateFxomDocument(String fxmlText, URL fxmlLocation, ResourceBundle resources, boolean checkTheme) throws IOException {
+    private void updateFxomDocument(String fxmlText, URL fxmlLocation, ResourceBundle resources, boolean checkTheme, FXOMDocumentSwitch ... switches) throws IOException {
         final FXOMDocument newFxomDocument;
         
         if (fxmlText != null) {
-            newFxomDocument = new FXOMDocument(fxmlText, fxmlLocation, getLibrary().getClassLoader(), resources, FXOMDocumentSwitch.NORMALIZED);
+            FXOMDocumentSwitch[] options = FXOMDocumentSwitch.combined(switches, FXOMDocumentSwitch.NORMALIZED);
+            newFxomDocument = new FXOMDocument(fxmlText, fxmlLocation, getLibrary().getClassLoader(), resources, options);
         } else {
             newFxomDocument = null;
         }
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
index b94279838e..d1c596a28f 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2017, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -44,22 +44,25 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import com.oracle.javafx.scenebuilder.kit.editor.EditorPlatform;
-
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.scene.Node;
-
 import com.oracle.javafx.scenebuilder.kit.fxom.glue.GlueDocument;
 import com.oracle.javafx.scenebuilder.kit.fxom.sampledata.SampleDataGenerator;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
 import com.oracle.javafx.scenebuilder.kit.util.URLUtils;
+
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.Parent;
 
 /**
@@ -81,6 +84,7 @@ public class FXOMDocument {
     private final SimpleIntegerProperty cssRevision = new SimpleIntegerProperty();
     private SceneGraphHolder sceneGraphHolder;
     private int updateDepth;
+    private final List<String> unresolvableImportTypes = new ArrayList<>();
 
     private boolean hasControlsFromExternalPlugin;
     
@@ -102,7 +106,8 @@ public class FXOMDocument {
      *                    (e.g. enforcing normalization)
      * @throws IOException when the fxmlText cannot be loaded
      */
-    public FXOMDocument(String fxmlText, URL location, ClassLoader classLoader, ResourceBundle resources, FXOMDocumentSwitch... switches) throws IOException {
+    public FXOMDocument(String fxmlText, URL location, ClassLoader classLoader, ResourceBundle resources,
+                        FXOMDocumentSwitch... switches) throws IOException {
         this.glue = new GlueDocument(fxmlText);
         this.location = location;
         this.classLoader = classLoader;
@@ -116,7 +121,7 @@ public FXOMDocument(String fxmlText, URL location, ClassLoader classLoader, Reso
                 fxmlTextToLoad = fxmlPropertiesDisabler.disableProperties(fxmlText);
             }
             final FXOMLoader loader = new FXOMLoader(this);
-            loader.load(fxmlTextToLoad);
+            loader.load(fxmlTextToLoad, switches);
             if (availableSwitches.contains(FXOMDocumentSwitch.NORMALIZED)) {
                 final FXOMNormalizer normalizer = new FXOMNormalizer(this);
                 normalizer.normalize();
@@ -130,6 +135,32 @@ public FXOMDocument(String fxmlText, URL location, ClassLoader classLoader, Reso
 
         hasControlsFromExternalPlugin = EditorPlatform.hasClassFromExternalPlugin(fxmlText);
     }
+
+    /**
+     * Adds the name of a class or a name space which could not be resolved by
+     * FXMLLoader.
+     * 
+     * @param unresolvableImportType A class name from an import which is
+     *                               effectively not known to the FXMLLoader (the
+     *                               type is generally not known to the JVM).
+     */
+    public void addUnresolvableType(String unresolvableImportType) {
+        unresolvableImportTypes.add(unresolvableImportType);
+    }
+
+    /**
+     * If there were unresolved FXML import statements, affected fully qualified
+     * type names are provided here.
+     * 
+     * @return List of unresolved FXML import type names.
+     */
+    public List<String> getUnresolvableTypes() {
+        return unresolvableImportTypes;
+    }
+    
+    public boolean hasUnresolvableTypes() {
+        return !this.unresolvableImportTypes.isEmpty();
+    }
         
     public FXOMDocument() {
         this.glue = new GlueDocument();
@@ -290,6 +321,27 @@ void setDisplayNode(Node displayNode) {
     public Object getDisplayNodeOrSceneGraphRoot() {
         return displayNode != null ? displayNode : sceneGraphRoot;
     }
+    
+    /**
+     * In case this {@link FXOMDocument} references types which cannot be resolved
+     * (e.g. not available via Library Manager), those types are removed from the
+     * FXML text.
+     * 
+     * @param wildcardImports Forces consolidated import statements using the
+     *                        asterisk as a wild card.
+     * @return The FXML string representation. This can be empty if current root is
+     *         null. This FXML will only hold imports which can be resolved (e.g.
+     *         are provided by the library manager).
+     */
+    public String getFxmlTextOmittingUnresolvableTypes(boolean wildcardImports) {
+        if (!hasUnresolvableTypes()) {
+            return getFxmlText(wildcardImports);
+        }
+        
+        String fxmlText = getFxmlText(wildcardImports);
+        Logger.getLogger(this.getClass().getName()).log(Level.FINE, "Detected unresolved imports.");
+        return new FXOMImportsRemover().removeImports(fxmlText, getUnresolvableTypes());
+    }
 
     /**
      * Returns the FXML string representation of the FXOMDocument.
@@ -488,6 +540,13 @@ public static interface SceneGraphHolder {
         public void fxomDocumentDidRefreshSceneGraph(FXOMDocument fxomDocument);
     }
     
+    /**
+     * When true, then there are import statements with unknown types (not on classpath).
+     */
+    protected boolean hasUnresolvableImports() {
+        return !this.unresolvableImportTypes.isEmpty();
+    }
+    
     /**
      * Depending on where the {@link FXOMDocument} shall be used, 
      * it is necessary to configure the {@link FXOMDocument} creation process.
@@ -506,6 +565,45 @@ public enum FXOMDocumentSwitch {
          * configuration. One possible example here is the option to use the MacOS
          * system menu bar.
          */
-        FOR_PREVIEW;
+        FOR_PREVIEW,
+        
+        /**
+         * This flag ensures that the {@link FXOMLoader} preserves imports which were
+         * not resolvable by {@link FXMLLoader}. This behavior is controlled using
+         * Preferences-API.
+         */
+        PRESERVE_UNRESOLVED_IMPORTS;
+        
+        /**
+         * Creates a new array holding the set of existing switches including the new
+         * switch.
+         * 
+         * @param existingSwitches Array (usually var args) with existing values.
+         * @param newSwitch        New option to be added to the whole set.
+         * @return Array of unique FXOMDocumentSwitch items consisting of the given
+         *         existing switches and the new one.
+         */
+        public static FXOMDocumentSwitch[] combined(FXOMDocumentSwitch[] existingSwitches,
+                                                    FXOMDocumentSwitch newSwitch) {
+            Set<FXOMDocumentSwitch> options = EnumSet.noneOf(FXOMDocumentSwitch.class);
+            options.addAll(Set.of(existingSwitches));
+            options.add(newSwitch);
+            return options.toArray(new FXOMDocumentSwitch[] {});
+        }
+        
+        /**
+         * When the toggle is true, then a single item array is created.
+         * 
+         * @param toggle Any element, e.g. item/switch from Scene Builder preferences.
+         * @return When the toggle is true, then a single item array is created,
+         *         otherwise the resulting array will be empty.
+         */
+        public FXOMDocumentSwitch[] fromToggle(boolean toggle) {
+            if (toggle) {
+                return new FXOMDocumentSwitch[] {this};
+            } else {
+                return new FXOMDocumentSwitch[] {};
+            }
+        }
     }
 }
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemover.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemover.java
new file mode 100644
index 0000000000..9e33685366
--- /dev/null
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemover.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit.fxom;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * This class provides the functionality to remove import declarations from a
+ * given FXML text by comparing the FXML text to the collection of fully
+ * qualified type names provided. <br>
+ * <br>
+ * Important, this class only remove such import statements, it does not verify
+ * if an import declaration is valid and a type exists. <br>
+ * <br>
+ * Example:
+ * 
+ *
+ * <pre>{@code
+ * Set<String> detectedUnresolvableTypes = new HashSet<>();
+ *
+ * String sourceFxmlText = """
+ *         <?xml version="1.0" encoding="UTF-8"?>
+ *         <?import javafx.scene.control.*?>
+ *         <?import another.unresolvable.Dependency?>
+ *         <?import also.an.unresolvable.Dependency?>
+ *         <?import this.namespace.is.unknown.*?>
+ *         <AnchorPane>
+ *             <children>
+ *                 <Button layoutX="302.0" layoutY="27.0" text="Button" />
+ *                 <ComboBox layoutX="46.0" layoutY="175.0" prefWidth="150.0" />
+ *                 <TextField layoutX="345.0" layoutY="264.0" />
+ *                 <Button layoutX="84.0" layoutY="252.0" text="Button" />
+ *                 <UnknownElement layoutX="84.0" layoutY="87.0" text="Some Content" />
+ *             </children>
+ *         </AnchorPane>
+ *         """;
+ *
+ * List<String> importsToRemove = List.of("another.unresolvable.Dependency", 
+ *                                        "also.an.unresolvable.Dependency");
+ *
+ * FXOMImportsRemover remover = new FXOMImportsRemover(detectedUnresolvableTypes::add);
+ * String cleanedFxmlText = remover.removeImports(sourceFxmlText, importsToRemove);
+ *
+ * }</pre>
+ * 
+ */
+class FXOMImportsRemover {
+    
+    private static final Logger LOGGER = Logger.getLogger(FXOMImportsRemover.class.getName());
+
+    private final Consumer<String> removedTypeConsumer;
+
+    /**
+     * By default, FXOMImportsRemover instances will remove imports which cannot 
+     * be resolved without triggering additional actions. If a different behavior
+     * is desired, one can use the constructor which accepts a {@code Consumer<String>} 
+     * process the declared types (fully qualified name). 
+     */
+    FXOMImportsRemover() {
+        this(_ -> {
+            /* no operation here by default  */
+        });
+    }
+
+    /**
+     * This constructor allows to assign a custom handler which is notified for each
+     * type which is about to removed from the FXML text which is about to be
+     * processed.
+     * 
+     * @param unresolvedTypeHandler This consumer of String must not be null. It
+     *                              will be notified for each type (fully qualified
+     *                              name) which cannot be resolved and is about to
+     *                              be ignored.
+     * @throws NullPointerException if {@code unresolvedTypeHandler} is {@code null}
+     */
+    FXOMImportsRemover(Consumer<String> unresolvedTypeHandler) {
+        this.removedTypeConsumer = unresolvedTypeHandler;
+    }
+    
+    /**
+     * Removes all imports from a given FXML for the given type names.
+     * 
+     * @param sourceFxml The source FXML.
+     * @param typesToRemove Type names which shall be removed. 
+     * @return FXML text without the previously removed types
+     */
+    public String removeImports(String sourceFxml, Collection<String> typesToRemove) {
+        var predicate = new IgnoreImportPredicate(removedTypeConsumer,typesToRemove);
+        if (typesToRemove.isEmpty()) {
+            return sourceFxml;
+        }
+        
+        LOGGER.log(Level.FINE, "Removing FXML imports.");
+        
+        /* 
+         * The predicate detects specific imports.
+         * In this case here, all lines which do not match the given types shall be kept.
+         */
+        return sourceFxml.lines()
+                         .filter(predicate)
+                         .collect(Collectors.joining(System.lineSeparator()));
+    }
+
+    /**
+     * This predicate will yield true for all FXML lines to keep and false for all
+     * FXML lines to ignore. Lines to be ignored are import statements with the
+     * given type names.
+     * <br>
+     * <br>
+     * Regex description
+     * <pre>
+     *  opening import declaration: &lt;?import
+     *  at least one whitespace, more are possible: (\\s\\s*)
+     *  the unresolved type name 
+     *  optional whitespace: (\\s*)
+     *  closing import declaration: [?]&gt;
+     * </pre>
+     */
+    private static class IgnoreImportPredicate implements Predicate<String> {
+
+        private final Map<String, Pattern> typesToRemove;
+        
+        private final Consumer<String> matchingTypeConsumer;
+
+        IgnoreImportPredicate(Consumer<String> unresolvedTypeConsumer, Collection<String> unresolvedTypes) {
+            this.matchingTypeConsumer = unresolvedTypeConsumer;
+            this.typesToRemove = unresolvedTypes.stream()
+                                                .collect(Collectors.toMap(String::valueOf, 
+                                                                 IgnoreImportPredicate::createRegex));
+        }
+
+        private static Pattern createRegex(String type) {
+            return Pattern.compile( "<[?]import(\\s*)" + type.replace(".", "[.]") + "(\\s*)[?]>");
+        }
+
+        @Override
+        public boolean test(String lineToTest) {
+            for (Entry<String,Pattern> entry : typesToRemove.entrySet()) {
+                var pattern = entry.getValue().matcher(lineToTest);
+                if (pattern.matches()) {
+                    LOGGER.log(Level.FINE, "Ignoring FXML import: {0}", lineToTest);
+                    matchingTypeConsumer.accept(entry.getKey());
+                    return false;
+                }
+            }
+            return true;
+        }
+
+    }
+}
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java
index c4ef3864cb..cffca0b5bd 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2017, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -34,6 +34,7 @@
 
 import com.oracle.javafx.scenebuilder.kit.i18n.I18N;
 import com.oracle.javafx.scenebuilder.kit.editor.panel.util.dialog.ErrorDialog;
+import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
 import javafx.fxml.LoadListener;
@@ -48,8 +49,12 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 
 /**
@@ -58,6 +63,7 @@
  */
 class FXOMLoader implements LoadListener {
 
+    private static final Logger LOGGER = Logger.getLogger(FXOMLoader.class.getName());
     private final FXOMDocument document;
     private final Consumer<Exception> knownErrorsHandler;
     private TransientNode currentTransientNode;
@@ -78,7 +84,7 @@ public FXOMLoader(FXOMDocument document) {
         this.knownErrorsHandler = Objects.requireNonNull(knownErrorsHandler);
     }
 
-    public void load(String fxmlText) throws java.io.IOException {
+    public void load(String fxmlText, FXOMDocumentSwitch ... switches) throws java.io.IOException {
         assert fxmlText != null;
 
         final ClassLoader classLoader;
@@ -102,11 +108,43 @@ public void load(String fxmlText) throws java.io.IOException {
             assert is.markSupported();
             is.reset();
             setSceneGraphRoot(fxmlLoader.load(is));
-        } catch (RuntimeException | IOException x) {
-            handleFxmlLoadingError(x);
+        } catch (RuntimeException | IOException fxmlLoaderError) {
+            showErrorOrHandleUnresolvedImports(fxmlText, fxmlLoaderError, switches);
         }
     }
 
+    private void showErrorOrHandleUnresolvedImports(String fxmlText, Exception fxmlLoaderError,
+            FXOMDocumentSwitch... switches) throws IOException {
+        Throwable cause = fxmlLoaderError.getCause();
+        if (handlingOfUnresolvedImportsIsEnabled(cause, switches)) {
+            handleUnresolvedImports(fxmlText, cause, switches);
+        } else {
+            handleFxmlLoadingError(fxmlLoaderError);
+        }
+    }
+
+    private void handleUnresolvedImports(String fxmlText, Throwable cause, FXOMDocumentSwitch... switches)
+            throws IOException {
+        String missingClassName = cause.getMessage();
+        LOGGER.log(Level.WARNING, "Failed to resolve class from FXML imports. "
+                + "Now trying loading FXML without {0}", missingClassName);
+        String modifiedFxml = removeUnresolvableTypeFromFXML(fxmlText, missingClassName);
+        load(modifiedFxml, switches);
+    }
+
+    private boolean handlingOfUnresolvedImportsIsEnabled(Throwable cause, FXOMDocumentSwitch... switches) {
+        if (!(cause instanceof ClassNotFoundException)) {
+            return false;
+        }
+        return Set.of(switches).contains(FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS) 
+                || document.hasUnresolvableImports();
+    }
+
+    private String removeUnresolvableTypeFromFXML(String fxmlText, String unresolvableType) {
+        FXOMImportsRemover remover = new FXOMImportsRemover(document::addUnresolvableType);
+        return remover.removeImports(fxmlText, List.of(unresolvableType));
+    }
+
     private void handleFxmlLoadingError(Exception x) throws IOException {
         if (x.getCause() != null) {
             handleKnownCauses(x);
@@ -122,7 +160,7 @@ private void handleUnknownAndMissingCauses(Exception x) throws IOException {
     private void handleKnownCauses(Exception x) throws IOException {
         if (x.getCause() instanceof XMLStreamException) {
             knownErrorsHandler.accept(x);
-        } else {                    
+        } else {
             handleUnknownAndMissingCauses(x);
         }
     }
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresher.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresher.java
index 893b18fa32..fed4d49d98 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresher.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Gluon and/or its affiliates.
+ * Copyright (c) 2019, 2025 Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -57,9 +57,8 @@
 class FXOMRefresher {
 
     public void refresh(FXOMDocument document) {
-        String fxmlText = null;
+        String fxmlText = document.getFxmlTextOmittingUnresolvableTypes(false);
         try {
-            fxmlText = document.getFxmlText(false);
             final FXOMDocument newDocument
                     = new FXOMDocument(fxmlText,
                     document.getLocation(),
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaver.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaver.java
index c478333a96..c0825af799 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaver.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -133,6 +133,9 @@ private List<GlueInstruction> getHeaderIncludes(FXOMDocument fxomDocument) {
 
         imports.addAll(findPropertyClasses(root.getChildObjects().toArray(FXOMObject[]::new)));
         imports.addAll(findPropertyClasses(root));
+        
+        // Handle imports wich were not resolvable at the time the document was loaded
+        imports.addAll(fxomDocument.getUnresolvableTypes());
 
         return createGlueInstructionsForImports(fxomDocument, imports);
     }
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preferences/PreferencesControllerBase.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preferences/PreferencesControllerBase.java
index f1cc28b3f8..d189cf427f 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preferences/PreferencesControllerBase.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preferences/PreferencesControllerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2017, 2025, Gluon and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -63,6 +63,7 @@ public abstract class PreferencesControllerBase {
     public static final String ACCORDION_ANIMATION = "ACCORDION_ANIMATION"; //NOI18N
     public static final String WILDCARD_IMPORT = "WILDCARD_IMPORT"; //NOI18N
     public static final String ALTERNATE_TEXT_INPUT_PASTE = "ALTERNATE_TEXT_INPUT_PASTE"; //NOI18N
+    public static final String PRESERVE_UNRESOLVED_IMPORTS = "PRESERVE_UNRESOLVED_IMPORTS"; //NOI18N
 
     // DOCUMENT SPECIFIC PREFERENCES
     public static final String PATH = "path"; //NOI18N
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preview/PreviewWindowController.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preview/PreviewWindowController.java
index 55beff0f62..070f708245 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preview/PreviewWindowController.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/preview/PreviewWindowController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Gluon and/or its affiliates.
+ * Copyright (c) 2016, 2025, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -259,7 +259,7 @@ public void run() {
                     FXOMDocument clone;
 
                     try {
-                        clone = new FXOMDocument(fxomDocument.getFxmlText(false),
+                        clone = new FXOMDocument(fxomDocument.getFxmlTextOmittingUnresolvableTypes(false),
                                 fxomDocument.getLocation(),
                                 fxomDocument.getClassLoader(),
                                 fxomDocument.getResources(),
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/JfxTestHelper.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/JfxTestHelper.java
new file mode 100644
index 0000000000..7baf976a64
--- /dev/null
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/JfxTestHelper.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation and Gluon nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+
+import javafx.application.Platform;
+
+/**
+ * Allows to run actions within the JavaFX platform thread.
+ */
+public class JfxTestHelper {
+    
+    private JfxTestHelper() {
+        /* test utility - not intended for instantiation */
+    }
+    
+    public static <T> T waitFor(Callable<T> callable) throws Exception {
+        FutureTask<T> task = new FutureTask<T>(callable);
+        if (Platform.isFxApplicationThread()) {
+            return callable.call();
+        } else {
+            Platform.runLater(task);
+            return task.get();
+        }
+    }
+}
+
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocumentTest.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocumentTest.java
index 0f9aa4e0f3..5a5741292f 100644
--- a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocumentTest.java
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Gluon and/or its affiliates.
+ * Copyright (c) 2021, 2025, Gluon and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -31,19 +31,23 @@
  */
 package com.oracle.javafx.scenebuilder.kit.fxom;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import static com.oracle.javafx.scenebuilder.kit.JfxTestHelper.waitFor;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
+import java.util.List;
 import java.util.ResourceBundle;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.ExecutionException;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -55,7 +59,6 @@
 import com.oracle.javafx.scenebuilder.kit.JfxInitializer;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
 
-import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.MenuBar;
 
@@ -281,14 +284,63 @@ public void that_missing_imports_during_defines_resolution_cause_exception() thr
         assertEquals(IllegalStateException.class, t.getClass());
         assertTrue(t.getMessage().contains("Bug in FXOMRefresher"));
     }
-
-    private <T> T waitFor(Callable<T> callable) throws Exception {
-        FutureTask<T> task = new FutureTask<T>(callable);
-        if (Platform.isFxApplicationThread()) {
-            return callable.call();
-        } else {
-            Platform.runLater(()->task.run());
-            return task.get();
+    
+    @Test
+    public void that_unresolvable_imports_cause_exception_by_default() throws Exception {
+        
+        URL location = getClass().getResource("UnresolvableImports.fxml");
+        String fxmlText = FXOMDocument.readContentFromURL(location);
+        
+        ClassLoader classLoader = null;
+        ResourceBundle resources = null;
+        FXOMDocumentSwitch[] switches = new FXOMDocumentSwitch[0]; 
+        
+        Throwable t = assertThrows(ExecutionException.class, 
+                ()->waitFor(()->new FXOMDocument(fxmlText, location, classLoader, resources, switches)));      
+        
+        while (t.getCause() != null) {
+            t = t.getCause();
         }
+        
+        assertInstanceOf(java.lang.ClassNotFoundException.class, t, "");
+        assertEquals("another.unresolvable.Dependency", t.getMessage());
     }
+    
+    @Test
+    public void that_unresolvable_imports_can_be_ignored_via_switch() throws Exception {
+        URL resource = getClass().getResource("UnresolvableImports.fxml");
+        String validFxmlText = FXOMDocument.readContentFromURL(resource);
+        
+        FXOMDocument document = assertDoesNotThrow(
+                ()->waitFor(
+                        ()->new FXOMDocument(validFxmlText, resource, null, null, FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS)
+                        ));
+        
+        List<String> unresolvableImports = document.getUnresolvableTypes();
+        assertEquals(2, unresolvableImports.size());
+        assertEquals("another.unresolvable.Dependency", unresolvableImports.get(0));
+        assertEquals("also.an.unresolvable.Dependency", unresolvableImports.get(1));
+    }
+    
+    @Test
+    public void that_document_can_be_created_even_with_unresolvable_imports() throws Exception {
+        
+        URL location = getClass().getResource("UnresolvableImports.fxml");
+        String fxmlText = FXOMDocument.readContentFromURL(location);
+        
+        ClassLoader classLoader = null;
+        ResourceBundle resources = null;
+        FXOMDocumentSwitch[] switches = new FXOMDocumentSwitch[]{FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS};
+        
+        var newDocument = assertDoesNotThrow(()->waitFor(()->new FXOMDocument(fxmlText,
+                                                                  location,
+                                                                  classLoader,
+                                                                  resources,
+                                                                  switches)));
+        
+        assertNotNull(newDocument);
+        assertTrue(newDocument.hasUnresolvableImports());
+        
+    }
+
 }
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemoverTest.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemoverTest.java
new file mode 100644
index 0000000000..57aedb0baa
--- /dev/null
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImportsRemoverTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit.fxom;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+class FXOMImportsRemoverTest {
+    
+    private FXOMImportsRemover classUnderTest;
+
+    @Test
+    void that_the_given_imports_are_removed() {
+        Set<String> detectedUnresolvableTypes = new HashSet<>();
+        classUnderTest = new FXOMImportsRemover(detectedUnresolvableTypes::add);
+        
+        String sourceFxmlText = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <?import javafx.scene.control.*?>
+                <?import another.unresolvable.Dependency?>
+                <?import also.an.unresolvable.Dependency?>
+                <?import this.namespace.is.unknown.*?>
+                <AnchorPane>
+                    <children>
+                        <Button layoutX="302.0" layoutY="27.0" text="Button" />
+                        <ComboBox layoutX="46.0" layoutY="175.0" prefWidth="150.0" />
+                        <TextField layoutX="345.0" layoutY="264.0" />
+                        <Button layoutX="84.0" layoutY="252.0" text="Button" />
+                        <UnknownElement layoutX="84.0" layoutY="87.0" text="Some Content" />
+                    </children>
+                </AnchorPane>
+                """;
+        
+        List<String> importsToRemove = List.of("another.unresolvable.Dependency", "also.an.unresolvable.Dependency");
+        String cleanedFxmlText = classUnderTest.removeImports(sourceFxmlText, importsToRemove);
+        
+        String expectedFxmlText = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <?import javafx.scene.control.*?>
+                <?import this.namespace.is.unknown.*?>
+                <AnchorPane>
+                    <children>
+                        <Button layoutX="302.0" layoutY="27.0" text="Button" />
+                        <ComboBox layoutX="46.0" layoutY="175.0" prefWidth="150.0" />
+                        <TextField layoutX="345.0" layoutY="264.0" />
+                        <Button layoutX="84.0" layoutY="252.0" text="Button" />
+                        <UnknownElement layoutX="84.0" layoutY="87.0" text="Some Content" />
+                    </children>
+                </AnchorPane>
+                """;
+        
+        assertTrue(detectedUnresolvableTypes.contains("another.unresolvable.Dependency"));
+        assertTrue(detectedUnresolvableTypes.contains("also.an.unresolvable.Dependency"));
+        assertEquals(expectedFxmlText.lines().limit(4).toList(), cleanedFxmlText.lines().limit(4).toList());
+    }
+    
+    @Test
+    void that_fxml_is_not_modified_when_nothing_is_to_be_removed() {
+        String sourceFxmlText = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <?import javafx.scene.control.*?>
+                <?import this.namespace.is.unknown.*?>
+                <AnchorPane>
+                    <children>
+                        <Button layoutX="302.0" layoutY="27.0" text="Button" />
+                        <ComboBox layoutX="46.0" layoutY="175.0" prefWidth="150.0" />
+                        <TextField layoutX="345.0" layoutY="264.0" />
+                        <Button layoutX="84.0" layoutY="252.0" text="Button" />
+                        <UnknownElement layoutX="84.0" layoutY="87.0" text="Some Content" />
+                    </children>
+                </AnchorPane>
+                """;
+        
+        classUnderTest = new FXOMImportsRemover();
+        String cleanedFxmlText = classUnderTest.removeImports(sourceFxmlText, List.of());
+        
+        assertEquals(sourceFxmlText, cleanedFxmlText);
+    }
+
+}
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresherTest.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresherTest.java
new file mode 100644
index 0000000000..44c49fdb67
--- /dev/null
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMRefresherTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation and Gluon nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit.fxom;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.oracle.javafx.scenebuilder.kit.JfxInitializer;
+import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
+import static com.oracle.javafx.scenebuilder.kit.fxom.FXOMTestHelper.createFXOMDocumentFrom;
+
+class FXOMRefresherTest {
+
+    private FXOMRefresher classUnderTest;
+    
+    @BeforeAll
+    public static void init() {
+        JfxInitializer.initialize();
+    }
+    
+    @Test
+    void that_FXOMDocument_with_unresolvable_imports_can_be_saved_with_all_imports_preserved() throws Exception {
+
+        FXOMDocument document = createFXOMDocumentFrom("UnresolvableImports.fxml", 
+                                                        FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS);
+        assertTrue(document.hasUnresolvableImports());
+        
+        classUnderTest = new FXOMRefresher();
+
+        assertDoesNotThrow(()->classUnderTest.refresh(document));
+
+    }
+
+}
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaverTest.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaverTest.java
new file mode 100644
index 0000000000..830f823a6d
--- /dev/null
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMSaverTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation and Gluon nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit.fxom;
+
+import static com.oracle.javafx.scenebuilder.kit.fxom.FXOMTestHelper.createFXOMDocumentFrom;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.oracle.javafx.scenebuilder.kit.JfxInitializer;
+import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
+
+class FXOMSaverTest {
+
+    @BeforeAll
+    public static void init() {
+        JfxInitializer.initialize();
+    }
+
+    @Test
+    void that_FXOMDocument_with_unresolvable_imports_can_be_saved_with_all_imports_preserved() throws Exception {
+        URL location = FXOMTestHelper.class.getResource("UnresolvableImports.fxml");
+
+        FXOMDocument document = createFXOMDocumentFrom(location, FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS);
+
+        FXOMSaver classUnderTest = new FXOMSaver();
+        Path outfile = Path.of("FXOMSaverTest_withUnresolvedTypes.fxml");
+        document.setLocation(outfile.toUri().toURL());
+
+        String generatedFxml = assertDoesNotThrow(() -> classUnderTest.save(document));
+        String generatedImports = generatedFxml.lines()
+                                               .filter(l -> l.startsWith("<?import"))
+                                               .collect(Collectors.joining("\n"));
+        
+        String expectedImports = """
+                <?import also.an.unresolvable.Dependency?>
+                <?import another.unresolvable.Dependency?>
+                <?import javafx.scene.control.Button?>
+                <?import javafx.scene.control.ComboBox?>
+                <?import javafx.scene.control.TextField?>
+                <?import javafx.scene.layout.AnchorPane?>""";
+
+        assertEquals(expectedImports, generatedImports);
+
+    }
+    
+    @Test
+    void that_FXOMSaver_preserves_wildcard_imports_if_requested() throws Exception {
+        URL location = FXOMTestHelper.class.getResource("UnresolvableImports.fxml");
+
+        FXOMDocument document = createFXOMDocumentFrom(location, FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS);
+        boolean preserveWildCardImports = true;
+        
+        FXOMSaver classUnderTest = new FXOMSaver(preserveWildCardImports);
+        Path outfile = Path.of("FXOMSaverTest_withUnresolvedTypes.fxml");
+        document.setLocation(outfile.toUri().toURL());
+
+        String generatedFxml = assertDoesNotThrow(() -> classUnderTest.save(document));
+        String generatedImports = generatedFxml.lines()
+                .filter(l -> l.startsWith("<?import"))
+                .collect(Collectors.joining("\n"));
+
+        /*
+         * Unresolved types are not considered when wildcard imports are allowed.
+         */
+        String expectedImports = """
+                <?import also.an.unresolvable.Dependency?>
+                <?import another.unresolvable.Dependency?>
+                <?import javafx.scene.control.*?>
+                <?import javafx.scene.layout.*?>""";
+        
+        assertEquals(expectedImports, generatedImports);
+    }
+
+}
diff --git a/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMTestHelper.java b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMTestHelper.java
new file mode 100644
index 0000000000..7979368a2c
--- /dev/null
+++ b/kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMTestHelper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, Gluon and/or its affiliates.
+ * All rights reserved. Use is subject to license terms.
+ *
+ * This file is available and licensed under the following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the name of Oracle Corporation and Gluon nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.oracle.javafx.scenebuilder.kit.fxom;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+import com.oracle.javafx.scenebuilder.kit.fxom.FXOMDocument.FXOMDocumentSwitch;
+
+public class FXOMTestHelper {
+
+    private FXOMTestHelper() {
+        /* Test Helper, not intended for instantiation */
+    }
+    
+    public static FXOMDocument createFXOMDocumentFrom(String resourceName, 
+                                                      FXOMDocumentSwitch... switches) throws Exception {
+        URL location = FXOMTestHelper.class.getResource(resourceName);
+        return createFXOMDocumentFrom(location, switches);
+    }
+    
+    public static FXOMDocument createFXOMDocumentFrom(URL location, FXOMDocumentSwitch... switches)
+            throws Exception {
+        String fxmlText = FXOMDocument.readContentFromURL(location);
+        ClassLoader classLoader = null;
+        ResourceBundle resources = null;
+        return new FXOMDocument(fxmlText, location, classLoader, resources, switches);
+    }
+
+}
diff --git a/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnresolvableImports.fxml b/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnresolvableImports.fxml
new file mode 100644
index 0000000000..1220704435
--- /dev/null
+++ b/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnresolvableImports.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import another.unresolvable.Dependency?>
+<?import also.an.unresolvable.Dependency?>
+<?import this.namespace.is.unknown.*?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity"
+	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+	prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
+	<children>
+		<Button layoutX="302.0" layoutY="27.0" mnemonicParsing="false"
+			text="Button" />
+		<ComboBox layoutX="46.0" layoutY="175.0" prefWidth="150.0" />
+		<TextField layoutX="354.0" layoutY="163.0" />
+		<TextField layoutX="345.0" layoutY="264.0" />
+		<Button layoutX="84.0" layoutY="252.0" mnemonicParsing="false"
+			text="Button" />
+		<Button layoutX="58.0" layoutY="14.0" mnemonicParsing="false"
+			text="Button" />
+		<Button layoutX="84.0" layoutY="87.0" mnemonicParsing="false"
+			text="Button" />
+		<UnknownElement layoutX="84.0" layoutY="87.0" mnemonicParsing="false"
+			text="UnknownElement in unknown namespace" />
+	</children>
+</AnchorPane>
diff --git a/pom.xml b/pom.xml
index 93948e20da..ee4a13de17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M5</version>
+                    <version>3.5.4</version>
                     <configuration>
                         <reuseForks>false</reuseForks>
                         <forkCount>1</forkCount>