diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index b764ffd3c80..6201667312f 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3358,3 +3358,5 @@ select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
 f1	f2	f2
 NULL	a	NULL
 drop table t1,t2;
+select * from (select * left join t on f1=f2) tt;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'on f1=f2) tt' at line 1
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index a53b984007f..826f1c205c1 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -2829,3 +2829,9 @@ create table t2 (f2 char not null);
 insert into t2 values('b');
 select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
 drop table t1,t2;
+
+#
+# Bug#15538 unchecked table absense caused server crash.
+#
+--error 1064
+select * from (select * left join t on f1=f2) tt;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index ce0cb35dcf8..49f2182e12a 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5248,13 +5248,13 @@ join_table:
 	| table_ref LEFT opt_outer JOIN_SYM table_ref
           ON
           {
+            YYERROR_UNLESS($1 && $5);
             /* Change the current name resolution context to a local context. */
             if (push_new_name_resolution_context(YYTHD, $1, $5))
               YYABORT;
           }
           expr
 	  {
-            YYERROR_UNLESS($1 && $5);
             add_join_on($5,$8);
             Lex->pop_context();
             $5->outer_join|=JOIN_TYPE_LEFT;
@@ -5279,6 +5279,7 @@ join_table:
 	| table_ref RIGHT opt_outer JOIN_SYM table_ref
           ON
           {
+            YYERROR_UNLESS($1 && $5);
             /* Change the current name resolution context to a local context. */
             if (push_new_name_resolution_context(YYTHD, $1, $5))
               YYABORT;
@@ -5286,7 +5287,6 @@ join_table:
           expr
           {
 	    LEX *lex= Lex;
-            YYERROR_UNLESS($1 && $5);
             if (!($$= lex->current_select->convert_right_join()))
               YYABORT;
             add_join_on($$, $8);