diff --git a/gstreamer-base/src/adapter.rs b/gstreamer-base/src/adapter.rs
index c9a749ddc..cf713dd2b 100644
--- a/gstreamer-base/src/adapter.rs
+++ b/gstreamer-base/src/adapter.rs
@@ -80,7 +80,8 @@ impl UniqueAdapter {
     }
 
     pub fn copy_bytes(&self, offset: usize, size: usize) -> Result<glib::Bytes, glib::BoolError> {
-        self.0.copy_bytes(offset, size)
+        // TBD: https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/issues/298
+        Ok(self.0.copy_bytes(offset, size))
     }
 
     #[cfg(any(feature = "v1_10", feature = "dox"))]
diff --git a/tutorials/src/bin/basic-tutorial-6.rs b/tutorials/src/bin/basic-tutorial-6.rs
index f825f79c9..84f492025 100644
--- a/tutorials/src/bin/basic-tutorial-6.rs
+++ b/tutorials/src/bin/basic-tutorial-6.rs
@@ -70,15 +70,10 @@ fn print_pad_capabilities(element: &gst::Element, pad_name: &str) {
         .expect("Could not retrieve pad");
 
     println!("Caps for the {} pad:", pad_name);
-    match pad.get_current_caps() {
-        Some(caps) => {
-            print_caps(&caps, "      ");
-        }
-        None => {
-            let caps = pad.query_caps(None).expect("Failed to query caps on pad");
-            print_caps(&caps, "      ");
-        }
-    }
+    let caps = pad
+        .get_current_caps()
+        .unwrap_or_else(|| pad.query_caps(None));
+    print_caps(&caps, "      ");
 }
 
 fn tutorial_main() {