Fixes: Previous commit introduced KeyError problems since blank values would not be saved