Fix for NPE in AndOrExpression