diff --git a/core/command.c b/core/command.c
index 00b6ed92f5..d60c07c7f1 100644
--- a/core/command.c
+++ b/core/command.c
@@ -1605,6 +1605,8 @@ static int mp_property_options(m_option_t *prop, int action, void *arg,
                                                   bstr0(ka->key));
     if (!opt)
         return M_PROPERTY_UNKNOWN;
+    if (!opt->data)
+        return M_PROPERTY_UNAVAILABLE;
 
     switch (ka->action) {
     case M_PROPERTY_GET: