am 3a90f1ed: am 1de84e96: am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.

* commit '3a90f1ed4ae6feed03f5a5a767540cfcb66423ce':