Fixed null pointer and added other logic

The data should be moth balled some more