Fixed issue: Added @throws