Change: Issue 474 - try to gather more info when an error happens