Added try/catch for removedirectory
Merge branch 'feature/RAZ-3439' into feature/develop-temp