Update error message detection

Change-Id: I3740275f3a844ff44860d09ac73d16323894162a