diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 8bd6e6c611c..e5e90380d61 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -87,6 +87,14 @@ static double	bpy_timer_run; /* time for each python script run */
 static double	bpy_timer_run_tot; /* accumulate python runs */
 #endif
 
+/* use for updating while a python script runs - in case of file load */
+void bpy_context_update(bContext *C)
+{
+	BPy_SetContext(C);
+	bpy_import_main_set(CTX_data_main(C));
+	BPY_modules_update(C); /* can give really bad results if this isnt here */
+}
+
 void bpy_context_set(bContext *C, PyGILState_STATE *gilstate)
 {
 	py_call_level++;
@@ -95,16 +103,7 @@ void bpy_context_set(bContext *C, PyGILState_STATE *gilstate)
 		*gilstate= PyGILState_Ensure();
 
 	if(py_call_level==1) {
-
-		if(C) { // XXX - should always be true.
-			BPy_SetContext(C);
-			bpy_import_main_set(CTX_data_main(C));
-		}
-		else {
-			fprintf(stderr, "ERROR: Python context called with a NULL Context. this should not happen!\n");
-		}
-
-		BPY_modules_update(C); /* can give really bad results if this isnt here */
+		bpy_context_update(C);
 
 #ifdef TIME_PY_RUN
 		if(bpy_timer_count==0) {
@@ -570,6 +569,12 @@ void BPY_modules_load_user(bContext *C)
 	if(bmain==NULL)
 		return;
 
+	/* update pointers since this can run from a nested script
+	 * on file load */
+	if(py_call_level) {
+		bpy_context_update(C);
+	}
+
 	bpy_context_set(C, &gilstate);
 
 	for(text=CTX_data_main(C)->text.first; text; text= text->id.next) {
diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h
index b16c8fe2e8c..09fbdf96ed2 100644
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_util.h
@@ -51,6 +51,7 @@ short BPy_errors_to_report(struct ReportList *reports);
 struct bContext *BPy_GetContext(void);
 void BPy_SetContext(struct bContext *C);
 
+extern void bpy_context_update(struct bContext *C);
 extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
 extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
 #endif