diff --git a/README.md b/README.md
index 8c6c0d701..419aa2683 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ To create a new random (V4) UUID and print it out in hexadecimal form:
 use uuid::Uuid;
 
 fn main() -> Result<(), Box<std::error::Error> {
-    let my_uuid = Uuid::new_v4().unwrap();
+    let my_uuid = Uuid::new_v4()?;
     println!("{}", my_uuid);
 }
 ```
diff --git a/src/lib.rs b/src/lib.rs
index b7bf0b629..ceeba67bf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,8 +93,8 @@
 //!
 //! use uuid::Uuid;
 //!
-//! fn main() {
-//!     let my_uuid = Uuid::new_v4().unwrap();
+//! fn main() -> Result<(), Box<std::error::Error> {
+//!     let my_uuid = Uuid::new_v4()?;
 //!     println!("{}", my_uuid);
 //! }
 //! ```
diff --git a/src/v4.rs b/src/v4.rs
index 172752d40..6c647997b 100644
--- a/src/v4.rs
+++ b/src/v4.rs
@@ -22,6 +22,7 @@ impl Uuid {
     ///
     /// [`getrandom`]: https://crates.io/crates/getrandom
     /// [`rand`]: https://crates.io/crates/rand
+    // TODO: change signature to support uuid's Error.
     pub fn new_v4() -> Result<Uuid, getrandom::Error> {
         let mut bytes = [0u8; 16];
         getrandom::getrandom(&mut bytes)?;