Ensure unlock before return