Couple of type hints

Added @throws

Added explicit class member

Change-Id: I46d14116441a5a59e311d5cbe57530e6e1a47725