- document = get_document_from_uri (uri, TRUE, &compression, error);
- if (*error == NULL) {
- uri_unc = ev_file_uncompress (uri, compression, error);
+ g_return_val_if_fail (uri != NULL, NULL);
+
+ document = get_document_from_uri (uri, TRUE, &compression, &err);
+ g_assert (document != NULL || err != NULL);
+
+ if (document != NULL) {
+ uri_unc = ev_file_uncompress (uri, compression, &err);