Fixed null data issue in current submissions
Fixed #43, but still this implementation needs enhancements when moving in to production