diff --git a/[refs] b/[refs]
index 5c4748b3a776..ba640d98346b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596e2024c42159fedf71b3d17fba78eed9b5bf10
+refs/heads/master: f82b959d26557fe4ce283d3b27050d4b8268ef1e
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index dea2d8afa2f4..f50b8ca8dc94 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/drivers/net/team/team.c
@@ -346,6 +346,8 @@ static int team_option_get(struct team *team,
 			   struct team_option_inst *opt_inst,
 			   struct team_gsetter_ctx *ctx)
 {
+	if (!opt_inst->option->getter)
+		return -EOPNOTSUPP;
 	return opt_inst->option->getter(team, ctx);
 }
 
@@ -355,6 +357,8 @@ static int team_option_set(struct team *team,
 {
 	int err;
 
+	if (!opt_inst->option->setter)
+		return -EOPNOTSUPP;
 	err = opt_inst->option->setter(team, ctx);
 	if (err)
 		return err;