locker and exception fix