--- trunk/grubby/grubby.c	2016/06/29 14:07:59	2960
+++ trunk/grubby/grubby.c	2016/06/29 14:41:26	2963
@@ -2370,9 +2370,11 @@
     } else {
 	char * title;
 	line = getLineByType(LT_MENUENTRY, entry->lines);
-	title = grub2ExtractTitle(line);
-	if (title)
-	    printf("title=%s\n", title);
+	if (line) {
+	    title = grub2ExtractTitle(line);
+	    if (title)
+		printf("title=%s\n", title);
+	}
     }
 
     for (j = 0, line = entry->lines; line; line = line->next) {
@@ -3323,9 +3325,13 @@
 
 	/* if title is supplied, the entry's title must match it. */
 	if (title) {
+	    char *linetitle;
+
 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
-	    char *linetitle = extractTitle(line);
+	    if (!line)
+		continue;
 
+	    linetitle = extractTitle(line);
 	    if (!linetitle)
 		continue;
 	    if (strcmp(title, linetitle)) {
@@ -3373,9 +3379,13 @@
 
 	/* if title is supplied, the entry's title must match it. */
 	if (title) {
+	    char *linetitle;
+
 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
-	    char *linetitle = extractTitle(line);
+	    if (!line)
+		continue;
 
+	    linetitle = extractTitle(line);
 	    if (!linetitle)
 		continue;
 	    if (strcmp(title, linetitle)) {