Another attempt at fixing execptions. It is very close to the last attempt but the offsets have been updated and checked.