Improved handling of indicator lockfile