diff --git a/builtin.c b/builtin.c
index 5d8116d8f..7353c7a68 100644
--- a/builtin.c
+++ b/builtin.c
@@ -219,19 +219,19 @@ wchar_t *builtin_help_get( const wchar_t *name )
 	sb_printf( &cmd, L"__fish_print_help %ls", name_esc );
 	
 
-	exec_subshell( (wchar_t *)cmd.buff, &lst );
-	
-	for( i=0; i<al_get_count( &lst); i++ )
-	{
-		sb_append( out, (wchar_t *)al_get( &lst, i ) );
-		sb_append( out, L"\n" );
+	if( exec_subshell( (wchar_t *)cmd.buff, &lst ) >= 0 )
+	{	
+		for( i=0; i<al_get_count( &lst); i++ )
+		{
+			sb_append( out, (wchar_t *)al_get( &lst, i ) );
+			sb_append( out, L"\n" );
+		}
 	}
-	
+		
 	al_destroy( &lst );
 	sb_destroy( &cmd );
 	free( name_esc );
 	
-
 	return (wchar_t *)out->buff;
 	
 }
diff --git a/input.c b/input.c
index 2e744cd02..d48cfb3ca 100644
--- a/input.c
+++ b/input.c
@@ -1678,7 +1678,7 @@ wint_t input_readch()
 	
 	int i;
 
-	CHECK_BLOCK();
+	CHECK_BLOCK( R_NULL );
 	
 	/*
 	  Clear the interrupted flag
diff --git a/parser.c b/parser.c
index 7cf0bf1f2..d80bbc9e9 100644
--- a/parser.c
+++ b/parser.c
@@ -130,7 +130,7 @@ The fish parser. Contains functions for parsing and evaluating code.
 /**
    Error when using return builtin outside of function definition
 */
-#define INVALID_RETURN_ERR_MSG _( L"'return' command command outside of function definition" )
+#define INVALID_RETURN_ERR_MSG _( L"'return' builtin command outside of function definition" )
 
 /**
    Error when using else builtin outside of if block