diff --git a/lib/fog/compute/requests/aws/create_volume.rb b/lib/fog/compute/requests/aws/create_volume.rb
index c7d4dc6c8..1944de153 100644
--- a/lib/fog/compute/requests/aws/create_volume.rb
+++ b/lib/fog/compute/requests/aws/create_volume.rb
@@ -38,6 +38,8 @@ module Fog
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Excon::Response.new
           if availability_zone && size
+            raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.") if snapshot_id && !@data[:snapshots][snapshot_id]
+
             response.status = 200
             volume_id = Fog::AWS::Mock.volume_id
             data = {