diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 6b348afbeb50..b7c6a826cb37 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -110,7 +110,7 @@ set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	int		ssid;
 	int		len;
-	u_int8_t	data[33];
+	u_int8_t	data[IEEE80211_NWID_LEN];
 
 	ssid = 0;
 	len = strlen(val);
@@ -121,7 +121,8 @@ set80211ssid(const char *val, int d, int s, const struct afswtch *rafp)
 
 	bzero(data, sizeof(data));
 	len = sizeof(data);
-	get_string(val, NULL, data, &len);
+	if (get_string(val, NULL, data, &len) == NULL)
+		exit(1);
 
 	set80211(s, IEEE80211_IOC_SSID, ssid, len, data);
 }