diff --git a/python/gui/auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip.in
index 5151a789088..cfc639061db 100644
--- a/python/gui/auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip.in
+++ b/python/gui/auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip.in
@@ -52,9 +52,6 @@ writes the ``qmlCode`` into a temporary file
 
     virtual void setFeature( const QgsFeature &feature );
 
-%Docstring
-passes the ``feature`` into the context property of the widget
-%End
 
 };
 
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
index 84bc7f347ff..de2aa98cc39 100644
--- a/src/app/qgsattributesformproperties.cpp
+++ b/src/app/qgsattributesformproperties.cpp
@@ -472,9 +472,11 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       newWidget = tree->addItem( parent, itemData );
       break;
     }
-    default:
-      //should not happen
+    case QgsAttributeEditorElement::AeTypeInvalid:
+    {
+      QgsDebugMsg( "Not loading invalid attribute editor type..." );
       break;
+    }
   }
   return newWidget;
 }
diff --git a/src/gui/editorwidgets/qgsqmlwidgetwrapper.h b/src/gui/editorwidgets/qgsqmlwidgetwrapper.h
index 99bba14d4ff..4edb8fb84ab 100644
--- a/src/gui/editorwidgets/qgsqmlwidgetwrapper.h
+++ b/src/gui/editorwidgets/qgsqmlwidgetwrapper.h
@@ -55,7 +55,6 @@ class GUI_EXPORT QgsQmlWidgetWrapper : public QgsWidgetWrapper
 
   public slots:
 
-    //! passes the \a feature into the context property of the widget
     void setFeature( const QgsFeature &feature ) override;
 
   private: