Fixed #1018: fallback on clean workspace when unable to restore the workspace
Merge pull request #1019 from dinhviethoa/1018-unable-to-restore

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