preparing for 2.10 added type Exception to case to avoid because of deprecations in 2.10
fixed minor issues, reverted from better failure handling because did not have time