move check for empty values to the correct file for real.