diff --git a/source/blender/editors/interface/interface_node.c b/source/blender/editors/interface/interface_node.c
index 3d0603206ee..372874c9e6f 100644
--- a/source/blender/editors/interface/interface_node.c
+++ b/source/blender/editors/interface/interface_node.c
@@ -558,6 +558,9 @@ void uiTemplateNodeView(uiLayout *layout, bContext *C, ID *id, bNodeTree *ntree,
 {
 	bNode *tnode;
 
+	if(!ntree)
+		return;
+
 	/* clear for cycle check */
 	for(tnode=ntree->nodes.first; tnode; tnode=tnode->next)
 		tnode->flag &= ~NODE_TEST;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 94f12911d33..e2664c39756 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2492,5 +2492,8 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
 	uiBlockSetEmboss(block, UI_EMBOSS);
 	
 	uiDefBut(block, LABEL, 0, report->message, UI_UNIT_X+10, 0, UI_UNIT_X+width, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");
+
+	/* XXX linking hack */
+	uiTemplateNodeView(NULL, NULL, NULL, NULL, NULL, NULL);
 }