Fixed erroring on null data and turned off sandbox solution