am 83e5941d: Fix NPE in Workspace

* commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942':
  Fix NPE in Workspace