Fixed trying to store empty values