Hygiene: Update method documentation & split exception to a file

Change-Id: Id77db0f21ee3fdaad4e040c853fadc605df212ea