diff --git a/packages/js/src/analysis/collectAnalysisData.js b/packages/js/src/analysis/collectAnalysisData.js
index 658e26a361d..d1254581381 100644
--- a/packages/js/src/analysis/collectAnalysisData.js
+++ b/packages/js/src/analysis/collectAnalysisData.js
@@ -36,7 +36,8 @@ export default function collectAnalysisData( editorData, store, customAnalysisDa
 	// Retrieve the block editor blocks from WordPress and filter on useful information.
 	let blocks = null;
 	if ( blockEditorDataModule ) {
-		blocks = blockEditorDataModule.getBlocks();
+		blocks = blockEditorDataModule.getBlocks() || [];
+		blocks = blocks.filter( block => block.isValid );
 	}
 
 	// Make a data structure for the paper data.
diff --git a/packages/yoastseo/src/pluggable.js b/packages/yoastseo/src/pluggable.js
index e5dd5717ad0..f953327980f 100644
--- a/packages/yoastseo/src/pluggable.js
+++ b/packages/yoastseo/src/pluggable.js
@@ -119,7 +119,7 @@ Pluggable.prototype._reloaded = function( pluginName ) {
  * @param {string}      pluginName 	    The plugin that is registering the modification.
  * @param {number}      priority	    (optional) Used to specify the order in which the callables associated with a particular filter are called.
  * 									    Lower numbers correspond with earlier execution.
- * @returns {boolean}                   Whether or not applying the hook was successfull.
+ * @returns {boolean}                   Whether or not applying the hook was successful.
  */
 Pluggable.prototype._registerModification = function( modification, callable, pluginName, priority ) {
 	if ( typeof modification !== "string" ) {