Merge "Fix bug where verification could crash on unresolved types."
am: 3bff678

* commit '3bff678d255c9551782a7fdfb356e758585e477d':
  Fix bug where verification could crash on unresolved types.