Gouvernathor
47b5184e06
it's a tad slower but it's a better general practice and we're in an error handling branch anyway (cherry picked from commit e80bd9e6e697fd594db4b73644a15392a268ae55)