diff --git a/mboxd.c b/mboxd.c
index e1f3251..ffd8c84 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -312,14 +312,6 @@
 
 	MSG_INFO("Starting Daemon\n");
 
-#ifdef VIRTUAL_PNOR_ENABLED
-	vpnor_create_partition_table(context);
-
-	strcpy(context->paths.ro_loc, PARTITION_FILES_RO_LOC);
-	strcpy(context->paths.rw_loc, PARTITION_FILES_RW_LOC);
-	strcpy(context->paths.prsv_loc, PARTITION_FILES_PRSV_LOC);
-#endif
-
 	rc = init_signals(context, &set);
 	if (rc) {
 		goto finish;
@@ -362,6 +354,14 @@
 		goto finish;
 	}
 
+#ifdef VIRTUAL_PNOR_ENABLED
+	vpnor_create_partition_table(context);
+
+	strcpy(context->paths.ro_loc, PARTITION_FILES_RO_LOC);
+	strcpy(context->paths.rw_loc, PARTITION_FILES_RW_LOC);
+	strcpy(context->paths.prsv_loc, PARTITION_FILES_PRSV_LOC);
+#endif
+
 	MSG_INFO("Entering Polling Loop\n");
 	rc = poll_loop(context);