Improve handling of non standard errors returned
0.2.2