Base: Handle error messages more selectively