fixed a null that was causing NPE durring code evaulation.