jfg-531

check data for null values
should be checked first
do not merge yet