null checking fxed for dataset controller
Add Empty string checking as well
Merge remote-tracking branch 'remote/master'