Added rudimental support for crashes caused by a timeout
Improved regular expressions