folder lock fix, handler logging