made the code more robust (against SCM computing null change set), and fixed the race condition (if GC happens during this operation.)