Null checking, Optimization and the oreDict fix