Fixed handling for empty form values