Added missing @throws to affected methods