diff --git a/mdm/type.go b/mdm/type.go
index 6d9f7b0..4007098 100644
--- a/mdm/type.go
+++ b/mdm/type.go
@@ -67,6 +67,9 @@ func (resolved *ResolvedEnrollment) Validate() error {
 
 // Resolved assembles a ResolvedEnrollment from an Enrollment
 func (e *Enrollment) Resolved() (r *ResolvedEnrollment) {
+	if e == nil {
+		return
+	}
 	if e.UDID != "" {
 		r = new(ResolvedEnrollment)
 		r.Type = Device
diff --git a/mdm/type_test.go b/mdm/type_test.go
index 27e9bd0..259edb4 100644
--- a/mdm/type_test.go
+++ b/mdm/type_test.go
@@ -4,6 +4,11 @@ import (
 	"testing"
 )
 
+func TestNilResolved(t *testing.T) {
+	var e *Enrollment
+	_ = e.Resolved()
+}
+
 func TestResolved(t *testing.T) {
 	for _, test := range []struct {
 		testName  string