Fixed #1018: fallback on clean workspace when unable to restore the workspace

review: @devoncarew