Merge change 4067

* changes:
  Improve symbol-related error checking