Passed exceptions into wrapper exceptions; misc other changes