Merge "Handle errors during cm handle search"