diff --git a/container/mesos/client.go b/container/mesos/client.go
index ce0c8ef1..3e612b56 100644
--- a/container/mesos/client.go
+++ b/container/mesos/client.go
@@ -141,6 +141,10 @@ func (self *client) getContainers() (mContainers, error) {
 		return nil, fmt.Errorf("failed to get mesos containers: %v", err)
 	}
 	cntrs := result.GetContainers
+
+	if cntrs == nil {
+		return nil, fmt.Errorf("failed to get mesos containers")
+	}
 	return cntrs, nil
 }