diff -r ff5842d62ccd lexer/src/org/netbeans/lib/lexer/inc/TokenHierarchyUpdate.java
--- a/lexer/src/org/netbeans/lib/lexer/inc/TokenHierarchyUpdate.java	Sat Nov 16 15:20:20 2013 +0400
+++ b/lexer/src/org/netbeans/lib/lexer/inc/TokenHierarchyUpdate.java	Mon Nov 18 14:33:26 2013 +0200
@@ -325,6 +325,9 @@
             if (tokenListChange == null) { // Joined or unjoined ETLs
                 assert (tokenListListUpdate != null);
                 if (tokenListListUpdate.tokenListList.joinSections()) {
+					if (tokenListListUpdate.tokenListList.joinTokenList() == null) {
+						tokenListListUpdate.tokenListList.checkCreateJoinTokenList();
+					}
                     tokenListChange = tokenListListUpdate.createJoinTokenListChange();
                 }
             } // else tokenListChange != null