Add empty check to submissions