Merge "Add in a missing unlockMutex() on an error path."