Updated phpdoc and removed throw_error()