updated getting of fields to return error if no result or final (optionally)