Merge "Allocate interrupted exception before re-acquiring lock"