Null validations done
Some Bug fixes