Fixed the code that was broken so that esapi can be included without weird effects.