diff --git a/GUI/Models/GUIObjectBuilder.cpp b/GUI/Models/GUIObjectBuilder.cpp
index d309663a18b12967a04d8c66ebef7c60cb67af01..0ff919040ef1ecd097c12b6b265a4d46beea9a6a 100644
--- a/GUI/Models/GUIObjectBuilder.cpp
+++ b/GUI/Models/GUIObjectBuilder.cpp
@@ -14,6 +14,7 @@
 
 #include "GUI/Models/GUIObjectBuilder.h"
 #include "Base/Const/Units.h"
+#include "Base/Utils/Assert.h"
 #include "Core/Simulation/includeSimulations.h"
 #include "GUI/Models/DocumentModel.h"
 #include "GUI/Models/Error.h"
@@ -92,13 +93,12 @@ SessionItem* GUI::Model::ObjectBuilder::populateInstrumentModel(InstrumentModel*
                        ? QString::fromStdString(simulation.instrument().getName())
                        : instrument_name;
 
-    if (auto gisasSimulation = dynamic_cast<const GISASSimulation*>(&simulation)) {
+    if (auto gisasSimulation = dynamic_cast<const GISASSimulation*>(&simulation))
         return createGISASInstrumentItem(p_instrument_model, *gisasSimulation, name);
-    } else if (auto offSpecSimulation = dynamic_cast<const OffSpecularSimulation*>(&simulation)) {
+    if (auto offSpecSimulation = dynamic_cast<const OffSpecularSimulation*>(&simulation))
         return createOffSpecularInstrumentItem(p_instrument_model, *offSpecSimulation, name);
-    } else if (auto spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation)) {
+    if (auto spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation))
         return createSpecularInstrumentItem(p_instrument_model, *spec_simulation, name);
-    }
 
     throw Error("GUI::Model::ObjectBuilder::populateInstrumentModel() -> Error. ISimulation is "
                 "not yet supported");