diff --git a/firebase-database/CHANGELOG.md b/firebase-database/CHANGELOG.md
index beadcdad905..5752c7b83df 100644
--- a/firebase-database/CHANGELOG.md
+++ b/firebase-database/CHANGELOG.md
@@ -1,4 +1,11 @@
-# 19.5.1 (Unreleased)
+# Unreleased
+- [fixed] Fixed a crash on some Pixel devices that occurred when closing the
+  network connection.
+- [added] Added `Query.get()`, which allows users to receive a single data
+  snapshot. `Query.get()` returns the latest value even if an older value
+  already exists in cache.
+
+# 19.5.1
 - [fixed] Fixes a regression in v19.4 that may cause assertion failures,
   especially when persistence is enabled.
 
diff --git a/firebase-database/src/main/java/com/google/firebase/database/tubesock/WebSocket.java b/firebase-database/src/main/java/com/google/firebase/database/tubesock/WebSocket.java
index 526b6a6dba3..532cfce1b17 100644
--- a/firebase-database/src/main/java/com/google/firebase/database/tubesock/WebSocket.java
+++ b/firebase-database/src/main/java/com/google/firebase/database/tubesock/WebSocket.java
@@ -261,8 +261,8 @@ private synchronized void closeSocket() {
     if (socket != null) {
       try {
         socket.close();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
+      } catch (Exception e) {
+        eventHandler.onError(new WebSocketException("Failed to close", e));
       }
     }
     state = State.DISCONNECTED;