diff --git a/amazonka-storagegateway.cabal b/amazonka-storagegateway.cabal
--- a/amazonka-storagegateway.cabal
+++ b/amazonka-storagegateway.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-storagegateway
-version:               0.0.6
+version:               0.0.7
 synopsis:              Amazon Storage Gateway SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -87,5 +87,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.0.6.*
+          amazonka-core == 0.0.7.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/StorageGateway/CreateTapes.hs b/gen/Network/AWS/StorageGateway/CreateTapes.hs
--- a/gen/Network/AWS/StorageGateway/CreateTapes.hs
+++ b/gen/Network/AWS/StorageGateway/CreateTapes.hs
@@ -169,4 +169,4 @@
 
 instance FromJSON CreateTapesResponse where
     parseJSON = withObject "CreateTapesResponse" $ \o -> CreateTapesResponse
-        <$> o .:  "TapeARNs"
+        <$> o .:? "TapeARNs" .!= mempty
diff --git a/gen/Network/AWS/StorageGateway/DescribeCache.hs b/gen/Network/AWS/StorageGateway/DescribeCache.hs
--- a/gen/Network/AWS/StorageGateway/DescribeCache.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeCache.hs
@@ -169,5 +169,5 @@
         <*> o .:? "CacheHitPercentage"
         <*> o .:? "CacheMissPercentage"
         <*> o .:? "CacheUsedPercentage"
-        <*> o .:  "DiskIds"
+        <*> o .:? "DiskIds" .!= mempty
         <*> o .:? "GatewayARN"
diff --git a/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs b/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeCachediSCSIVolumes.hs
@@ -130,4 +130,4 @@
 
 instance FromJSON DescribeCachediSCSIVolumesResponse where
     parseJSON = withObject "DescribeCachediSCSIVolumesResponse" $ \o -> DescribeCachediSCSIVolumesResponse
-        <$> o .:  "CachediSCSIVolumes"
+        <$> o .:? "CachediSCSIVolumes" .!= mempty
diff --git a/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs b/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
--- a/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeChapCredentials.hs
@@ -133,4 +133,4 @@
 
 instance FromJSON DescribeChapCredentialsResponse where
     parseJSON = withObject "DescribeChapCredentialsResponse" $ \o -> DescribeChapCredentialsResponse
-        <$> o .:  "ChapCredentials"
+        <$> o .:? "ChapCredentials" .!= mempty
diff --git a/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs b/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
--- a/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeGatewayInformation.hs
@@ -174,7 +174,7 @@
     parseJSON = withObject "DescribeGatewayInformationResponse" $ \o -> DescribeGatewayInformationResponse
         <$> o .:? "GatewayARN"
         <*> o .:? "GatewayId"
-        <*> o .:  "GatewayNetworkInterfaces"
+        <*> o .:? "GatewayNetworkInterfaces" .!= mempty
         <*> o .:? "GatewayState"
         <*> o .:? "GatewayTimezone"
         <*> o .:? "GatewayType"
diff --git a/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs b/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeStorediSCSIVolumes.hs
@@ -128,4 +128,4 @@
 
 instance FromJSON DescribeStorediSCSIVolumesResponse where
     parseJSON = withObject "DescribeStorediSCSIVolumesResponse" $ \o -> DescribeStorediSCSIVolumesResponse
-        <$> o .:  "StorediSCSIVolumes"
+        <$> o .:? "StorediSCSIVolumes" .!= mempty
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs b/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapeArchives.hs
@@ -153,7 +153,7 @@
 instance FromJSON DescribeTapeArchivesResponse where
     parseJSON = withObject "DescribeTapeArchivesResponse" $ \o -> DescribeTapeArchivesResponse
         <$> o .:? "Marker"
-        <*> o .:  "TapeArchives"
+        <*> o .:? "TapeArchives" .!= mempty
 
 instance AWSPager DescribeTapeArchives where
     page rq rs
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs b/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapeRecoveryPoints.hs
@@ -162,7 +162,7 @@
     parseJSON = withObject "DescribeTapeRecoveryPointsResponse" $ \o -> DescribeTapeRecoveryPointsResponse
         <$> o .:? "GatewayARN"
         <*> o .:? "Marker"
-        <*> o .:  "TapeRecoveryPointInfos"
+        <*> o .:? "TapeRecoveryPointInfos" .!= mempty
 
 instance AWSPager DescribeTapeRecoveryPoints where
     page rq rs
diff --git a/gen/Network/AWS/StorageGateway/DescribeTapes.hs b/gen/Network/AWS/StorageGateway/DescribeTapes.hs
--- a/gen/Network/AWS/StorageGateway/DescribeTapes.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeTapes.hs
@@ -160,7 +160,7 @@
 instance FromJSON DescribeTapesResponse where
     parseJSON = withObject "DescribeTapesResponse" $ \o -> DescribeTapesResponse
         <$> o .:? "Marker"
-        <*> o .:  "Tapes"
+        <*> o .:? "Tapes" .!= mempty
 
 instance AWSPager DescribeTapes where
     page rq rs
diff --git a/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs b/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
--- a/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeUploadBuffer.hs
@@ -139,7 +139,7 @@
 
 instance FromJSON DescribeUploadBufferResponse where
     parseJSON = withObject "DescribeUploadBufferResponse" $ \o -> DescribeUploadBufferResponse
-        <$> o .:  "DiskIds"
+        <$> o .:? "DiskIds" .!= mempty
         <*> o .:? "GatewayARN"
         <*> o .:? "UploadBufferAllocatedInBytes"
         <*> o .:? "UploadBufferUsedInBytes"
diff --git a/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs b/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
--- a/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeVTLDevices.hs
@@ -168,7 +168,7 @@
     parseJSON = withObject "DescribeVTLDevicesResponse" $ \o -> DescribeVTLDevicesResponse
         <$> o .:? "GatewayARN"
         <*> o .:? "Marker"
-        <*> o .:  "VTLDevices"
+        <*> o .:? "VTLDevices" .!= mempty
 
 instance AWSPager DescribeVTLDevices where
     page rq rs
diff --git a/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs b/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
--- a/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
+++ b/gen/Network/AWS/StorageGateway/DescribeWorkingStorage.hs
@@ -148,7 +148,7 @@
 
 instance FromJSON DescribeWorkingStorageResponse where
     parseJSON = withObject "DescribeWorkingStorageResponse" $ \o -> DescribeWorkingStorageResponse
-        <$> o .:  "DiskIds"
+        <$> o .:? "DiskIds" .!= mempty
         <*> o .:? "GatewayARN"
         <*> o .:? "WorkingStorageAllocatedInBytes"
         <*> o .:? "WorkingStorageUsedInBytes"
diff --git a/gen/Network/AWS/StorageGateway/ListGateways.hs b/gen/Network/AWS/StorageGateway/ListGateways.hs
--- a/gen/Network/AWS/StorageGateway/ListGateways.hs
+++ b/gen/Network/AWS/StorageGateway/ListGateways.hs
@@ -137,7 +137,7 @@
 
 instance FromJSON ListGatewaysResponse where
     parseJSON = withObject "ListGatewaysResponse" $ \o -> ListGatewaysResponse
-        <$> o .:  "Gateways"
+        <$> o .:? "Gateways" .!= mempty
         <*> o .:? "Marker"
 
 instance AWSPager ListGateways where
diff --git a/gen/Network/AWS/StorageGateway/ListLocalDisks.hs b/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
--- a/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
+++ b/gen/Network/AWS/StorageGateway/ListLocalDisks.hs
@@ -119,5 +119,5 @@
 
 instance FromJSON ListLocalDisksResponse where
     parseJSON = withObject "ListLocalDisksResponse" $ \o -> ListLocalDisksResponse
-        <$> o .:  "Disks"
+        <$> o .:? "Disks" .!= mempty
         <*> o .:? "GatewayARN"
diff --git a/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs b/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
--- a/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
+++ b/gen/Network/AWS/StorageGateway/ListVolumeRecoveryPoints.hs
@@ -124,4 +124,4 @@
 instance FromJSON ListVolumeRecoveryPointsResponse where
     parseJSON = withObject "ListVolumeRecoveryPointsResponse" $ \o -> ListVolumeRecoveryPointsResponse
         <$> o .:? "GatewayARN"
-        <*> o .:  "VolumeRecoveryPointInfos"
+        <*> o .:? "VolumeRecoveryPointInfos" .!= mempty
diff --git a/gen/Network/AWS/StorageGateway/ListVolumes.hs b/gen/Network/AWS/StorageGateway/ListVolumes.hs
--- a/gen/Network/AWS/StorageGateway/ListVolumes.hs
+++ b/gen/Network/AWS/StorageGateway/ListVolumes.hs
@@ -156,7 +156,7 @@
     parseJSON = withObject "ListVolumesResponse" $ \o -> ListVolumesResponse
         <$> o .:? "GatewayARN"
         <*> o .:? "Marker"
-        <*> o .:  "VolumeInfos"
+        <*> o .:? "VolumeInfos" .!= mempty
 
 instance AWSPager ListVolumes where
     page rq rs
diff --git a/gen/Network/AWS/StorageGateway/Types.hs b/gen/Network/AWS/StorageGateway/Types.hs
--- a/gen/Network/AWS/StorageGateway/Types.hs
+++ b/gen/Network/AWS/StorageGateway/Types.hs
@@ -422,7 +422,7 @@
 instance FromJSON Error' where
     parseJSON = withObject "Error'" $ \o -> Error'
         <$> o .:? "errorCode"
-        <*> o .:  "errorDetails"
+        <*> o .:? "errorDetails" .!= mempty
 
 instance ToJSON Error' where
     toJSON Error'{..} = object