Fix to prevent Geoserver lookup error