No longer uses HttpException and updated docblock
Clean up :)