Restore exception support.
Fix mistake in the HPT code.