Fix Call/Error messages behaviors