#122 additional checks for empty values