diff --git a/riscos/401login.c b/riscos/401login.c
index 5929fbeb1..195e4c740 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -36,13 +36,19 @@ static struct browser_window *bwin;
 
 void ro_gui_401login_init(void)
 {
-	char name[] = "dialog_401li";
+	char name[20];
 	int context, window_size, data_size;
 	char *data;
+	os_error *e;
+
+        strncpy(name, "dialog_401li", 20);
 
 	/* find required buffer sizes */
-	context = wimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS,
-			name, 0, &window_size, &data_size);
+	e = xwimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS,
+			name, 0, &window_size, &data_size, &context);
+	if (e) {
+	  die(e->errmess);
+	}
 	assert(context != 0);
 
 	dialog_401_template = xcalloc((unsigned int) window_size, 1);
diff --git a/riscos/gui.c b/riscos/gui.c
index 696ac1abf..a0524bd91 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -103,6 +103,7 @@ static char *ro_path_to_url(const char *path);
 void gui_init(int argc, char** argv)
 {
 	char theme_fname[256];
+	os_error *e;
 
 	NETSURF_DIR = getenv("NetSurf$Dir");
 	messages_load("<NetSurf$Dir>.Resources.en.Messages");
@@ -129,7 +130,10 @@ void gui_init(int argc, char** argv)
 	}
 	ro_theme_load(theme_fname);
 
-	wimp_open_template("<NetSurf$Dir>.Resources.en.Templates");
+	e = xwimp_open_template("<NetSurf$Dir>.Resources.en.Templates");
+	if(e) {
+	  die(e->errmess);
+	}
 	ro_gui_dialog_init();
 	ro_gui_download_init();
 	ro_gui_menus_init();