Index: /trunk/FACT++/src/Configuration.cc
===================================================================
--- /trunk/FACT++/src/Configuration.cc	(revision 11019)
+++ /trunk/FACT++/src/Configuration.cc	(revision 11020)
@@ -389,21 +389,21 @@
 
     mysqlpp::Connection conn(db.c_str(), server.c_str(), user.c_str(), passwd.c_str(), port);
+    /* throws exceptions
     if (!conn.connected())
     {
         cout << "MySQL connection error: " << conn.error() << endl;
         throw;
-    }
+    }*/
 
     // Retrieve a subset of the sample stock table set up by resetdb
     // and display it.
     // FIXME: What about a prefix?
-    mysqlpp::Query query = conn.query("select `Key`, Value from Configuration");
-
-    mysqlpp::StoreQueryResult res = query.store();
+    const mysqlpp::StoreQueryResult res = conn.query("select `Key`, Value from Configuration").store();
+    /* throws exceptions
     if (!res)
     {
         cout << "MySQL query failed: " << query.error() << endl;
         throw;
-    }
+    }*/
 
     set<string> allowed_options;
@@ -421,5 +421,5 @@
     po::parsed_options result(&desc);
 
-    for (vector<mysqlpp::Row>::iterator v=res.begin(); v<res.end(); v++)
+    for (vector<mysqlpp::Row>::const_iterator v=res.begin(); v<res.end(); v++)
     {
         const string key = (*v)[0].c_str();
