Adding Nullcheck