Extra check to catch empty values