Looking to fix null pointer issue
Looking to fix null pointer issue