Added exceptions and updated review comments