Directories are now deleted too in case of exception