diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 15a176b480..c588171a46 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -517,6 +517,8 @@ int VirtualMachine::select(SqlDB * db)
             History * hp;
 
             hp = new History(oid, i);
+            history_records[i] = hp;
+
             rc = hp->select(db);
 
             if ( rc != 0)
@@ -524,8 +526,6 @@ int VirtualMachine::select(SqlDB * db)
                 goto error_previous_history;
             }
 
-            history_records[i] = hp;
-
             if ( i == last_seq )
             {
                 history = hp;