diff --git a/Dockerfile b/Dockerfile
index f7143cd..3406dba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,7 @@ RUN CGO_ENABLED=0 go build -o ./driver ./cmd/driver/main.go
 # Build an driver image
 FROM scratch
 
-COPY ./resolvers.settings.yaml /app/resolvers.settings.yaml
-COPY ./signers.settings.yaml /app/signers.settings.yaml
+COPY ./*.settings.yaml /app/
 COPY --from=base /build/driver /app/driver
 COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 
diff --git a/pkg/services/did.go b/pkg/services/did.go
index 669a57b..6410e66 100644
--- a/pkg/services/did.go
+++ b/pkg/services/did.go
@@ -153,7 +153,13 @@ func (d *DidDocumentServices) GetDidDocument(ctx context.Context, did string, op
 	)
 
 	if opts.Signature != "" {
+		if d.signers == nil {
+			return nil, errors.New("signers not initialized")
+		}
 		signer, err := d.signers.GetEIP712SignerByNetwork(string(b), string(n))
+		if err != nil {
+			return nil, fmt.Errorf("invalid signer: %v", err)
+		}
 		errResolution, err = expectedError(err)
 		if err != nil {
 			return errResolution, err