Catch the rmdir exceptions

Change-Id: I7cd37aeebca4dd160768584a79acddac28d494d9
tag v0r0p29

Change-Id: I342e9ec54c9654f6f096e6224084f5f36fe8231d