LOW :fix an issue with lookup when parameter is null + NPE Protection