Update for issue #607 to make throwing of exceptions the default behavior