diff --git a/src/sysc/core_complex.cpp b/src/sysc/core_complex.cpp
index 7327e79..37205d3 100644
--- a/src/sysc/core_complex.cpp
+++ b/src/sysc/core_complex.cpp
@@ -45,11 +45,10 @@
 #include <scc/report.h>
 #include <util/ities.h>
 #include <iostream>
-#include <sstream>
 #include <array>
-#include <numeric>
 #include <iss/plugin/cycle_estimate.h>
 #include <iss/plugin/instruction_count.h>
+#include <util/ities.h>
 
 // clang-format on
 
@@ -269,7 +268,7 @@ template <unsigned int BUSWIDTH> void core_complex<BUSWIDTH>::before_end_of_elab
     sc_assert(cpu->vm != nullptr);
     auto disass = GET_PROP_VALUE(enable_disass);
     if(disass && trc->m_db)
-        SCCINFO(SCMOD)<<"Disasssembly will only be in transaction trace database!";
+        SCCINFO(SCMOD) << "Disasssembly will only be in transaction trace database!";
     cpu->vm->setDisassEnabled(disass || trc->m_db != nullptr);
     if(GET_PROP_VALUE(plugins).length()) {
         auto p = util::split(GET_PROP_VALUE(plugins), ';');
@@ -308,17 +307,20 @@ template <unsigned int BUSWIDTH> void core_complex<BUSWIDTH>::before_end_of_elab
 template <unsigned int BUSWIDTH> void core_complex<BUSWIDTH>::start_of_simulation() {
     // quantum_keeper.reset();
     if(GET_PROP_VALUE(elf_file).size() > 0) {
-        istringstream is(GET_PROP_VALUE(elf_file));
-        string s;
-        while(getline(is, s, ',')) {
-            std::pair<uint64_t, bool> start_addr = cpu->load_file(s);
+        auto file_names = util::split(GET_PROP_VALUE(elf_file), ',');
+        for(auto& s : file_names) {
+            std::pair<uint64_t, bool> load_result = cpu->load_file(s);
+            if(!std::get<1>(load_result)) {
+                SCCWARN(SCMOD) << "Could not load FW file " << s;
+            } else {
 #ifndef CWR_SYSTEMC
-            if(reset_address.is_default_value() && start_addr.second == true)
-                reset_address.set_value(start_addr.first);
+                if(reset_address.is_default_value())
+                    reset_address.set_value(load_result.first);
 #else
-            if(start_addr.second == true)
-                reset_address = start_addr.first;
+                if(start_addr.second == true)
+                    reset_address = start_addr.first;
 #endif
+            }
         }
     }
     if(trc->m_db != nullptr && trc->stream_handle == nullptr) {