added not_found, modified server_err