diff --git a/mboxd.c b/mboxd.c
index f92d9fb..070c8bc 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -334,7 +334,7 @@
 	/* Set the LPC bus mapping */
 	rc = reset_lpc(context);
 	if (rc) {
-		goto finish;
+		MSG_ERR("LPC configuration failed, RESET required: %d\n", rc);
 	}
 
 	rc = set_bmc_events(context, BMC_EVENT_DAEMON_READY, SET_BMC_EVENT);
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index fad0c7f..1756516 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -114,7 +114,7 @@
         phosphor::logging::commit<err::InternalFailure>();
         return -MBOX_R_SYSTEM_ERROR;
     }
-    catch (vpnor::TocEntryError &e)
+    catch (vpnor::ReasonedError &e)
     {
         MSG_ERR("%s\n", e.what());
         phosphor::logging::commit<err::InternalFailure>();