Merge "FM: Handle the error responses"