The previous fix related to Highlighter and SyntaxHighlighter getting different values than they expected didn't handle the case where currentBlock or userData returned null.