diff --git a/src/lib_rdi_format/rdi_format.h b/src/lib_rdi_format/rdi_format.h
index aba064e5..2924dc49 100644
--- a/src/lib_rdi_format/rdi_format.h
+++ b/src/lib_rdi_format/rdi_format.h
@@ -52,7 +52,7 @@ typedef int64_t  RDI_S64;
 
 // \"raddbg\0\0\"
 #define RDI_MAGIC_CONSTANT   0x0000676264646172
-#define RDI_ENCODING_VERSION 6
+#define RDI_ENCODING_VERSION 7
 
 ////////////////////////////////////////////////////////////////
 //~ Format Types & Functions
diff --git a/src/rdi_format/rdi_format.mdesk b/src/rdi_format/rdi_format.mdesk
index bb3931cd..e292a5c6 100644
--- a/src/rdi_format/rdi_format.mdesk
+++ b/src/rdi_format/rdi_format.mdesk
@@ -62,7 +62,7 @@
   "";
   "// \"raddbg\0\0\"";
   "#define RDI_MAGIC_CONSTANT   0x0000676264646172";
-  "#define RDI_ENCODING_VERSION 6";
+  "#define RDI_ENCODING_VERSION 7";
   "";
   "////////////////////////////////////////////////////////////////";
   "//~ Format Types & Functions";
diff --git a/src/rdi_from_pdb/rdi_from_pdb.c b/src/rdi_from_pdb/rdi_from_pdb.c
index e0eaa4ca..de944eea 100644
--- a/src/rdi_from_pdb/rdi_from_pdb.c
+++ b/src/rdi_from_pdb/rdi_from_pdb.c
@@ -2696,7 +2696,7 @@ internal TS_TASK_FUNCTION_DEF(p2r_symbol_stream_convert_task__entry_point)
           
           // rjf: find current procedure's frameproc
           CV_SymFrameproc *frameproc = 0;
-          if(procedure_num != 0 && procedure_frameprocs[procedure_num-1] != 0 && procedure_num < procedure_frameprocs_count)
+          if(procedure_num != 0 && procedure_num <= procedure_frameprocs_count && procedure_frameprocs[procedure_num-1] != 0)
           {
             frameproc = procedure_frameprocs[procedure_num-1];
           }
@@ -2774,7 +2774,7 @@ internal TS_TASK_FUNCTION_DEF(p2r_symbol_stream_convert_task__entry_point)
           
           // rjf: find current procedure's frameproc
           CV_SymFrameproc *frameproc = 0;
-          if(procedure_num != 0 && procedure_frameprocs[procedure_num-1] != 0 && procedure_num < procedure_frameprocs_count)
+          if(procedure_num != 0 && procedure_num <= procedure_frameprocs_count && procedure_frameprocs[procedure_num-1] != 0)
           {
             frameproc = procedure_frameprocs[procedure_num-1];
           }