fixed highlighting bug caused by fixing of NullPointerException