TODO for null pointer exception