diff --git a/lib/element/custom_element.js b/lib/element/custom_element.js
index 0a09ff1..7758a6a 100644
--- a/lib/element/custom_element.js
+++ b/lib/element/custom_element.js
@@ -1101,7 +1101,12 @@ function renderCustomTemplate(re_render) {
 			return;
 		}
 
-		_finishRender.call(that, err);
+		try {
+			_finishRender.call(that, err);
+		} catch (_err) {
+			return pledge.reject(_err);
+		}
+
 		doEarlyResolve(false);
 	});
 
@@ -2484,13 +2489,13 @@ function _finishRender(err) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    2.1.3
- * @version  2.3.16
+ * @version  2.4.0
  */
 function _resolveRender(err) {
 
 	if (err) {
 		const renderer = this.hawkejs_renderer;
-		let message = renderer.hawkejs.handleError(renderer, this.start_template.name, this.start_line_nr, err);
+		let message = renderer.hawkejs.handleError(renderer, this.start_template?.name || 'unknown', this.start_line_nr, err);
 		let pre = this.createElement('pre');
 		pre.textContent = message;
 		this.append(pre);