Fixed test failure due to error handling change. Which reminds me to install NCrunch! :)