FIX: Make exception wrapping work under Python 3