fixing some null issues
fixing some null issues
Pretty much no change