make sure data is not null
Merge branch 'master' into staging