diff --git a/Exception/DeadlineExceededException.php b/Exception/DeadlineExceededException.php
new file mode 100644
index 0000000..1d0b85b
--- /dev/null
+++ b/Exception/DeadlineExceededException.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\Core\Exception;
+
+/**
+ * Exception thrown when a request takes too long to complete.
+ * In REST context, this exception indicates a status code 504.
+ */
+class DeadlineExceededException extends ServiceException
+{
+
+}
diff --git a/GrpcRequestWrapper.php b/GrpcRequestWrapper.php
index 2fe028f..d1c5634 100644
--- a/GrpcRequestWrapper.php
+++ b/GrpcRequestWrapper.php
@@ -231,6 +231,10 @@ private function convertToGoogleException(ApiException $ex)
                 $exception = Exception\AbortedException::class;
                 break;
 
+            case Grpc\STATUS_DEADLINE_EXCEEDED:
+                $exception = Exception\DeadlineExceededException::class;
+                break;
+
             default:
                 $exception = Exception\ServiceException::class;
                 break;
diff --git a/RequestWrapper.php b/RequestWrapper.php
index 2418a8a..8baf9bf 100644
--- a/RequestWrapper.php
+++ b/RequestWrapper.php
@@ -233,6 +233,10 @@ private function convertToGoogleException(\Exception $ex)
                 $exception = Exception\ServerException::class;
                 break;
 
+            case 504:
+                $exception = Exception\DeadlineExceededException::class;
+                break;
+
             default:
                 $exception = Exception\ServiceException::class;
                 break;