firebase
diff --git a/‎firebase_admin/db.py
Lines changed: 7 additions & 8 deletions b/‎firebase_admin/db.py
Lines changed: 7 additions & 8 deletions
diff --git a/‎integration/test_db.py
Lines changed: 8 additions & 0 deletions b/‎integration/test_db.py
Lines changed: 8 additions & 0 deletions
diff --git a/‎tests/test_db.py
Lines changed: 10 additions & 0 deletions b/‎tests/test_db.py
Lines changed: 10 additions & 0 deletions
@@ -169,19 +169,18 @@ def get_if_changed(self, etag):
         Raises:
           ValueError: If the ETag is not a string.
         """
-        # pylint: disable=missing-raises-doc
+        #pylint: disable=protected-access
         if not isinstance(etag, six.string_types):
             raise ValueError('ETag must be a string.')
 
-        try:
-            value, headers = self._client.request('get', self._add_suffix(),
-                                                  headers={'if-none-match': etag},
-                                                  resp_headers=True)
+        resp = self._client._do_request('get', self._add_suffix(),
+                                        headers={'if-none-match': etag})
+        if resp.status_code == 200:
+            value, headers = resp.json(), resp.headers
             new_etag = headers.get('ETag')
             return True, new_etag, value
-        except ApiCallError as error:
-            # what to do here?
-            raise error
+        elif resp.status_code == 304:
+            return False, etag, None
 
     def set(self, value):
         """Sets the data at this location to the given value.
 
@@ -155,6 +155,14 @@ def test_etag(self, testref):
         etag = python.etag()
         assert isinstance(etag, six.string_types)
 
+    def test_get_if_changed(self, testref):
+        python = testref.parent
+        push_data = {'name' : 'Edward Cope', 'since' : 1800}
+        edward = python.child('users').push(push_data)
+        changed_data = edward.get_if_changed('wrong_etag')
+        assert changed_data[0]
+        assert changed_data[2] == push_data
+
     def test_get_and_set_with_etag(self, testref):
         python = testref.parent
         push_data = {'name' : 'Edward Cope', 'since' : 1800}
 
@@ -153,6 +153,16 @@ def test_get_with_etag(self, data):
         assert recorder[0].headers['Authorization'] == 'Bearer mock-token'
         assert recorder[0].headers['User-Agent'] == db._USER_AGENT
 
+    @pytest.mark.parametrize('data', valid_values)
+    def test_get_if_changed(self, data):
+        ref = db.reference('/test')
+        recorder = self.instrument(ref, json.dumps(data))
+
+        assert ref.get_if_changed('1') == (True, '0', data)
+        assert len(recorder) == 1
+        assert recorder[0].method == 'GET'
+        assert recorder[0].url == 'https://test.firebaseio.com/test.json'
+
     @pytest.mark.parametrize('data', valid_values)
     def test_etag(self, data):
         ref = db.reference('/test')