diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index df16a0fd7..a96701f59 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -218,8 +218,8 @@ static void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *
 	 * CMSUB_FRAME     - userdata = hlcache_object *
 	 * CMSUB_URL       - userdata = char *
 	 * CMSUB_OBJECT    - userdata = hlcache_object *
-	 * CMSUB_SEL       - userdata = gui_window *
-	 * CMSUB_NAVIGATE  - userdata = browser_window * (only for menu construction)
+	 * CMSUB_SEL       - userdata = gui_window * (only for menu construction)
+	 * CMSUB_NAVIGATE  - userdata = browser_window * 
 	 * CMID_SELECTFILE - userdata = ami_file_input_menu_data *
 	 */
 
diff --git a/amiga/gui.c b/amiga/gui.c
index dd4daafac..5d11bdae4 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -477,8 +477,11 @@ colour_option_from_pen(UWORD pen,
 /* exported interface documented in amiga/gui.h */
 STRPTR ami_gui_get_screen_title(void)
 {
-	if(nsscreentitle == NULL)
+	if(nsscreentitle == NULL) {
 		nsscreentitle = ASPrintf("NetSurf %s", netsurf_version);
+		/* If this fails it will be NULL, which means we'll get the screen's
+		 * default titlebar text instead - so no need to check for error. */
+	}
 
 	return nsscreentitle;
 }