diff --git a/protocol/authenticator.go b/protocol/authenticator.go
index 4ce7aab..8424fe5 100644
--- a/protocol/authenticator.go
+++ b/protocol/authenticator.go
@@ -321,16 +321,14 @@ func (a *AuthenticatorData) unmarshalAttestedData(rawAuthData []byte) (err error
 }
 
 // Unmarshall the credential's Public Key into CBOR encoding.
-func unmarshalCredentialPublicKey(keyBytes []byte) ([]byte, error) {
+func unmarshalCredentialPublicKey(keyBytes []byte) (rawBytes []byte, err error) {
 	var m interface{}
 
-	err := webauthncbor.Unmarshal(keyBytes, &m)
-	if err != nil {
+	if err = webauthncbor.Unmarshal(keyBytes, &m); err != nil {
 		return nil, err
 	}
 
-	rawBytes, err := webauthncbor.Marshal(m)
-	if err != nil {
+	if rawBytes, err = webauthncbor.Marshal(m); err != nil {
 		return nil, err
 	}
 
diff --git a/protocol/webauthncbor/webauthncbor.go b/protocol/webauthncbor/webauthncbor.go
index 1aff823..2886d0f 100644
--- a/protocol/webauthncbor/webauthncbor.go
+++ b/protocol/webauthncbor/webauthncbor.go
@@ -19,7 +19,10 @@ var ctap2CBOREncMode, _ = cbor.CTAP2EncOptions().EncMode()
 // following the CTAP2 canonical CBOR encoding form.
 // (https://fidoalliance.org/specs/fido-v2.0-ps-20190130/fido-client-to-authenticator-protocol-v2.0-ps-20190130.html#message-encoding)
 func Unmarshal(data []byte, v interface{}) error {
-	return ctap2CBORDecMode.Unmarshal(data, v)
+	// TODO (james-d-elliott): investigate the specific use case for Unmarshal vs UnmarshalFirst to determine the edge cases where this may be useful.
+	_, err := ctap2CBORDecMode.UnmarshalFirst(data, v)
+
+	return err
 }
 
 // Marshal encodes the value pointed to by v
diff --git a/protocol/webauthncose/webauthncose.go b/protocol/webauthncose/webauthncose.go
index f68f8bf..308adef 100644
--- a/protocol/webauthncose/webauthncose.go
+++ b/protocol/webauthncose/webauthncose.go
@@ -180,6 +180,7 @@ func HasherFromCOSEAlg(coseAlg COSEAlgorithmIdentifier) func() hash.Hash {
 // ParsePublicKey figures out what kind of COSE material was provided and create the data for the new key.
 func ParsePublicKey(keyBytes []byte) (interface{}, error) {
 	pk := PublicKeyData{}
+	// TODO (james-d-elliott): investigate the ignored errors.
 	webauthncbor.Unmarshal(keyBytes, &pk)
 
 	switch COSEKeyType(pk.KeyType) {