fix: avoid undefined/null expression values

fix: avoid undefined/null expression values #487