No longer uses HttpException and updated docblock