[IMPROVEMENT] We now make sure that all parameneters are non nil.