benrhughes Fix bug in error handling
Latest commit daf1b92 Jul 26, 2017