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 89e1c2ef0..43338b171 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
@@ -67,6 +67,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;
@@ -396,7 +397,13 @@ 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 = PreferencesController.getSingleton().getRecordGlobal()
+                                                            .isPreserveUnresolvedImports() 
+                                                            ? new FXOMDocumentSwitch[] {FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS} 
+                                                            : new FXOMDocumentSwitch[0];
+
+        editorController.setFxmlTextAndLocation(fxmlText, fxmlURL, false, options);
         updateLoadFileTime();
         updateStageTitle(); // No-op if fxml has not been loaded yet
         updateFromDocumentPreferences(true);
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 70986c61f..f3068e9e6 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
@@ -99,8 +99,10 @@ public String toString() {
     static final int DEFAULT_RECENT_ITEMS_SIZE = 15;
     static final boolean DEFAULT_ACCORDION_ANIMATION = true;
     static final boolean DEFAULT_WILDCARD_IMPORTS = false;
+    static final boolean DEFAULT_PRESERVE_UNRESOLVED_IMPORTS = true;
+
     static final boolean DEFAULT_ALTERNATE_TEXT_INPUT_PASTE = EditorPlatform.IS_MAC;
-    
+
     /***************************************************************************
      *                                                                         *
      * Instance fields                                                         *
@@ -115,6 +117,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;
@@ -386,10 +389,18 @@ public void setWildcardImports(boolean wildcardImports) {
         this.wildcardImports = wildcardImports;
     }
 
+    public boolean isPreserveUnresolvedImports() {
+        return this.preserveUnresolvedImports;
+    }
+
+    public void setPreserveUnresolvedImports(boolean preserveUnresolvedImports) {
+        this.preserveUnresolvedImports = preserveUnresolvedImports;
+    }
+
     public boolean isAlternateTextInputControlPaste() {
         return alternatePasteBehavior;
     }
-    
+
     public void setAlternateTextInputControlPaste(boolean alternatePasteBehavior) {
         this.alternatePasteBehavior = alternatePasteBehavior;
     }
@@ -480,6 +491,7 @@ public void readFromJavaPreferences() {
 
         // Wildcard imports
         setWildcardImports(applicationRootPreferences.getBoolean(WILDCARD_IMPORT, DEFAULT_WILDCARD_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));
@@ -549,6 +561,8 @@ public void writeToJavaPreferences(String key) {
             case WILDCARD_IMPORT:
                 applicationRootPreferences.putBoolean(WILDCARD_IMPORT, isWildcardImports());
                 break;
+            case PRESERVE_UNRESOLVED_IMPORTS:
+                applicationRootPreferences.putBoolean(PRESERVE_UNRESOLVED_IMPORTS, isPreserveUnresolvedImports());
             case ALTERNATE_TEXT_INPUT_PASTE:
                 applicationRootPreferences.putBoolean(ALTERNATE_TEXT_INPUT_PASTE,isAlternateTextInputControlPaste());
                 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 57a3774ed..1e9ffbdb6 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
@@ -53,6 +53,7 @@
 import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.RECENT_ITEMS_SIZE;
 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.PRESERVE_UNRESOLVED_IMPORTS;
 import static com.oracle.javafx.scenebuilder.app.preferences.PreferencesController.ALTERNATE_TEXT_INPUT_PASTE;
 
 import static com.oracle.javafx.scenebuilder.kit.preferences.PreferencesRecordGlobalBase.DEFAULT_ALIGNMENT_GUIDES_COLOR;
@@ -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;
@@ -268,6 +271,8 @@ protected void controllerDidLoadFxml() {
         // Wildcard Imports
         wildcardImports.setSelected(recordGlobal.isWildcardImports());
         wildcardImports.selectedProperty().addListener(new WildcardImportListener());
+        preserveUnresolvedImports.setSelected(recordGlobal.isPreserveUnresolvedImports());
+        preserveUnresolvedImports.selectedProperty().addListener(new PreserveUnresolvedImportListener());
 
         if (EditorPlatform.IS_MAC) {
             // Alternate paste behavior for Text Input Controls
@@ -597,6 +602,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 98c136064..0bba93df4 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
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 23af4ca44..c7ca80475 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, 2022, 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" prefHeight="-Infinity" prefWidth="550.0" 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 41073419a..c4993d792 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
@@ -103,11 +103,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -759,10 +761,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);
     }
 
@@ -2562,11 +2565,13 @@ 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);
+            Set<FXOMDocumentSwitch> options = EnumSet.of(FXOMDocumentSwitch.NORMALIZED);
+            options.addAll(Set.of(switches));
+            newFxomDocument = new FXOMDocument(fxmlText, fxmlLocation, getLibrary().getClassLoader(), resources, options.toArray(new FXOMDocumentSwitch[0]));
         } else {
             newFxomDocument = null;
         }
@@ -2581,8 +2586,35 @@ private void updateFxomDocument(String fxmlText, URL fxmlLocation, ResourceBundl
         if (checkTheme) {
             WarnThemeAlert.showAlertIfRequired(this, newFxomDocument, ownerWindow);
         }
+        
+        if (unresolvedImportsFound(newFxomDocument)) {
+            showUnresolvedImportsDialog(newFxomDocument);
+        }
     }
-    
+
+    private boolean unresolvedImportsFound(final FXOMDocument newFxomDocument) {
+        return newFxomDocument != null && newFxomDocument.isClassesMissing();
+    }
+
+    private void showUnresolvedImportsDialog(FXOMDocument document) {
+        final ErrorDialog errorDialog = new ErrorDialog(ownerWindow);
+        List<String> missingClasses = document.getMissingClasses();
+        String first10 = missingClasses.stream()
+                                       .limit(10)
+                                       .collect(Collectors.joining(";"+System.lineSeparator()));
+
+        errorDialog.setMessage(I18N.getString("alert.open.failure.unresolved.imports", Integer.toString(missingClasses.size())));
+        errorDialog.setDetails(I18N.getString("alert.open.failure.unresolved.imports.details", first10));
+
+        String allMissing = document.getMissingClasses()
+                                    .stream()
+                                    .collect(Collectors.joining(";"+System.lineSeparator()));
+
+        errorDialog.setDebugInfo(I18N.getString("alert.open.failure.unresolved.imports.advice", allMissing, missingClasses.size()));
+        errorDialog.setTitle(I18N.getString("alert.title.open"));
+        errorDialog.showAndWait();
+    }
+
     private final ChangeListener<ClassLoader> libraryClassLoaderListener
             = (ov, t, t1) -> libraryClassLoaderDidChange();
     
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/panel/util/dialog/ErrorDialog.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/panel/util/dialog/ErrorDialog.java
index 2696e8518..e8338bfa0 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/panel/util/dialog/ErrorDialog.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/editor/panel/util/dialog/ErrorDialog.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -88,9 +89,10 @@ public void setDebugInfoWithThrowable(Throwable t) {
     private void updateActionButtonVisibility() {
         setActionButtonVisible(debugInfo != null);
     }
-    
+
     private void showDetailsDialog() {
-        final TextViewDialog detailDialog = new TextViewDialog(null);
+        final TextViewDialog detailDialog = new TextViewDialog(super.getStage());
+        detailDialog.setTitle(I18N.getString("alert.title.details"));
         detailDialog.setText(debugInfo);
         detailDialog.showAndWait();
     }
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 7d2a7ef53..420ac66b3 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
@@ -54,6 +54,7 @@
 
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 
 import com.oracle.javafx.scenebuilder.kit.fxom.glue.GlueDocument;
@@ -81,6 +82,7 @@ public class FXOMDocument {
     private final SimpleIntegerProperty cssRevision = new SimpleIntegerProperty();
     private SceneGraphHolder sceneGraphHolder;
     private int updateDepth;
+    private List<String> missingClasses = new ArrayList<>();
 
     private boolean hasGluonControls;
     
@@ -116,7 +118,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,7 +132,29 @@ public FXOMDocument(String fxmlText, URL location, ClassLoader classLoader, Reso
 
         hasGluonControls = fxmlText.contains(EditorPlatform.GLUON_PACKAGE);
     }
-        
+
+    /**
+     * Adds the name of a class or a name space which could not be resolved by FXMLLoader.
+     * 
+     * @param missingClassName Either a class namr from an import or a name space from a wild card import.
+     */
+    public void addMissingClass(String missingClassName) {
+        this.missingClasses.add(missingClassName);
+    }
+
+    /**
+     * If there were unresolved FXML import statements, affected class names and package name spaces are provided here.
+     * 
+     * @return list of unresolved FXML import class names or name spaces.
+     */
+    public List<String> getMissingClasses() {
+        return this.missingClasses;
+    }
+
+    public boolean isClassesMissing() {
+        return !this.missingClasses.isEmpty();
+    }
+
     public FXOMDocument() {
         this.glue = new GlueDocument();
     }
@@ -185,7 +209,7 @@ public void setClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
         endUpdate();
     }    
-    
+
     public List<Class<?>> getInitialDeclaredClasses() {
         return initialDeclaredClasses;
     }
@@ -227,8 +251,8 @@ public void setSampleDataEnabled(boolean sampleDataEnabled) {
                 sampleDataGenerator.assignSampleData(fxomRoot);
             }
         }
-    }    
-    
+    }
+
     public FXOMObject getFxomRoot() {
         return fxomRoot;
     }
@@ -506,6 +530,12 @@ 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;
     }
 }
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 0fa6dcaf7..757f42564 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
@@ -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;
@@ -47,9 +48,15 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 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;
+import java.util.stream.Collectors;
 
 
 /**
@@ -58,6 +65,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 +86,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;
@@ -103,8 +111,32 @@ public void load(String fxmlText) throws java.io.IOException {
             is.reset();
             setSceneGraphRoot(fxmlLoader.load(is));
         } catch (RuntimeException | IOException x) {
-            handleFxmlLoadingError(x);
+            Throwable cause = x.getCause();
+            if (cause instanceof ClassNotFoundException missingClass 
+                && Set.of(switches).contains(FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS)) {
+                String missingClassName = missingClass.getMessage();
+                String modifiedFxml = removeMissingClassesImports(fxmlText, missingClassName);
+                LOGGER.log(Level.WARNING, "Failed to resolve class from FXML imports. Try loading FXML without {0}", missingClassName);
+                load(modifiedFxml, switches);
+            } else {                
+                handleFxmlLoadingError(x);
+            }
+        }
+    }
+
+    private String removeMissingClassesImports(String fxmlText, String missingClass) {
+        List<String> lines = new ArrayList<>(fxmlText.lines().toList());
+        for (int i = 0; i < lines.size(); i++) {
+            if (lines.get(i).matches("^\s?[<]\s?[?]\s?import\s?.*")) {
+                    if (lines.get(i).contains(missingClass)) {
+                        document.addMissingClass(missingClass);
+                        lines.set(i, "");
+                        break;
+                    }
+            }
         }
+        return lines.stream()
+                    .collect(Collectors.joining(System.lineSeparator()));
     }
 
     private void handleFxmlLoadingError(Exception x) throws IOException {
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 c478333a9..ad5aa3bb9 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, 2022, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -114,6 +114,9 @@ private void updateImportInstructions(FXOMDocument fxomDocument) {
         // gets list of the imports to be added to the FXML document.
         List<GlueInstruction> importList = getHeaderIncludes(fxomDocument);
 
+        List<GlueInstruction> missingImports = getMissingClassesImports(fxomDocument);;
+        importList.addAll(missingImports);
+
         // synchronizes the glue with the list of glue instructions
         synchronizeHeader(fxomDocument.getGlue(), importList);
     }
@@ -136,6 +139,12 @@ private List<GlueInstruction> getHeaderIncludes(FXOMDocument fxomDocument) {
 
         return createGlueInstructionsForImports(fxomDocument, imports);
     }
+    
+    private List<GlueInstruction> getMissingClassesImports(FXOMDocument fxomDocument) {
+        final Set<String> imports = new TreeSet<>(); // Sorted
+        imports.addAll(fxomDocument.getMissingClasses());
+        return createGlueInstructionsForImports(fxomDocument, imports);
+    }
 
     private Set<String> findPropertyClasses(FXOMObject... fxomObjects) {
         return Arrays.stream(fxomObjects)
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/glue/GlueInstruction.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/glue/GlueInstruction.java
index 6a10c801b..7b30a9490 100644
--- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/glue/GlueInstruction.java
+++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/glue/GlueInstruction.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2017, 2022, Gluon and/or its affiliates.
  * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
@@ -54,5 +55,9 @@ public String getData() {
         return data;
     }
     
+    @Override
+    public String toString() {
+        return "GlueInstruction: %s : %s".formatted(String.valueOf(target), String.valueOf(data));
+    }
 
 }
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 4a1f28c30..98f713ff3 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
@@ -62,6 +62,7 @@ public abstract class PreferencesControllerBase {
     public static final String HIERARCHY_DISPLAY_OPTION = "HIERARCHY_DISPLAY_OPTION"; //NOI18N
     public static final String ACCORDION_ANIMATION = "ACCORDION_ANIMATION"; //NOI18N
     public static final String WILDCARD_IMPORT = "WILDCARD_IMPORT"; //NOI18N
+    public static final String PRESERVE_UNRESOLVED_IMPORTS = "PRESERVE_UNRESOLVED_IMPORTS"; //NOI18N
     public static final String ALTERNATE_TEXT_INPUT_PASTE = "ALTERNATE_TEXT_INPUT_PASTE"; //NOI18N
 
     // DOCUMENT SPECIFIC PREFERENCES
diff --git a/kit/src/main/resources/com/oracle/javafx/scenebuilder/kit/i18n/SceneBuilderKit.properties b/kit/src/main/resources/com/oracle/javafx/scenebuilder/kit/i18n/SceneBuilderKit.properties
index decb59e0e..9350c5029 100644
--- a/kit/src/main/resources/com/oracle/javafx/scenebuilder/kit/i18n/SceneBuilderKit.properties
+++ b/kit/src/main/resources/com/oracle/javafx/scenebuilder/kit/i18n/SceneBuilderKit.properties
@@ -533,9 +533,13 @@ file.filter.label.fxml = FXML Document
 # Alert (from app i18n)
 # -----------------------------------------------------------------------------
 alert.title.open = Open
+alert.title.details = Details
 
 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. Please 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
 
 # -----------------------------------------------------------------------------
 # Themes (from app i18n)
diff --git a/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnusedImports.fxml b/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnusedImports.fxml
index 0756cb986..a6799c2f3 100644
--- a/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnusedImports.fxml
+++ b/kit/src/test/resources/com/oracle/javafx/scenebuilder/kit/fxom/UnusedImports.fxml
@@ -2,6 +2,10 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+<?import java.util.Date?>
+<?import java.math.*?>
+<?import java.util.Set?>
+<?import org.junit.Test?>
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity"
 	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"