Added @throws tags