Merge branch 'gidden-liberr' into develop

cyclus · May 26, 2014 · a128a34 · a128a34
2 parents b36a2c8 + 276a877
commit a128a34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/unix_helper_functions.h b/src/unix_helper_functions.h
@@ -29,9 +29,12 @@ void DynamicModule::SetConstructor() {
                  dlsym(module_library_, ctor_name_.c_str());
 
   if (!ctor_) {
-    std::string err_msg = "Unable to load module constructor: ";
-    err_msg  += dlerror();
-    throw IOError(err_msg);
+    std::stringstream ss;
+    std::string agent = ctor_name_;
+    agent.erase(0, 9); // len(Construct) == 9
+    ss << "Could not find agent " << agent << " in module library "
+       << path_.c_str() << " (" << dlerror() << ").";
+    throw IOError(ss.str());
   }
 
   dlerror();  // reset errors

diff --git a/src/windows_helper_functions.h b/src/windows_helper_functions.h
@@ -28,9 +28,12 @@ void DynamicModule::SetConstructor() {
                  GetProcAddress(module_library_, ctor_name_.c_str());
 
   if (!ctor_) {
-    string err_msg = "Unable to load agent constructor: ";
-    err_msg += GetLastError();
-    throw IOError(err_msg);
+    std::stringstream ss;
+    std::string agent = ctor_name_;
+    agent.erase(0, 9); // len(Construct) == 9
+    ss << "Could not find agent " << agent << " in module library "
+       << path_.c_str() << " (" << GetLastError() << ").";
+    throw IOError(ss.str());
   }
 }