X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ab8458af1a3f3a82487e10384c2fd61906db7c85..bd471a9eadaf564fb4beafd7db995b7762942c1d:/sdk/go/keepclient/support.go

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index a8c82aac0e..8d299815b2 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -164,7 +164,11 @@ func (kc *KeepClient) BlockWrite(ctx context.Context, req arvados.BlockWriteOpti
 		req.Hash = fmt.Sprintf("%x", m.Sum(nil))
 	}
 	if req.StorageClasses == nil {
-		req.StorageClasses = kc.StorageClasses
+		if len(kc.StorageClasses) > 0 {
+			req.StorageClasses = kc.StorageClasses
+		} else {
+			req.StorageClasses = kc.DefaultStorageClasses
+		}
 	}
 	if req.Replicas == 0 {
 		req.Replicas = kc.Want_replicas
@@ -255,7 +259,7 @@ func (kc *KeepClient) BlockWrite(ctx context.Context, req arvados.BlockWriteOpti
 							msg += resp + "; "
 						}
 						msg = msg[:len(msg)-2]
-						return resp, InsufficientReplicasError(errors.New(msg))
+						return resp, InsufficientReplicasError{error: errors.New(msg)}
 					}
 					break
 				}