am c6be6eec: Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

* commit 'c6be6eec2800e4908ef9b5ff86b8c185dfa19030':
  Fix NPE if workspace is not created yet