Added support for more error patterns