am 64ca9c1a: am 90f9f957: am 83e5941d: Fix NPE in Workspace

* commit '64ca9c1acb2f572e381efd544785c30fd1cab898':