Marked exceptions as Serializable
Fixed another off-by-one error.