diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 067fa63660..c11601733d 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -910,7 +910,6 @@ FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
 	case LFUN_OUTLINE_DOWN:
 	case LFUN_OUTLINE_IN:
 	case LFUN_OUTLINE_OUT:
-	case LFUN_ERROR_NEXT:
 	case LFUN_NOTE_NEXT:
 	case LFUN_REFERENCE_NEXT:
 	case LFUN_WORD_FIND:
@@ -1091,10 +1090,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & cmd)
 		updateLabels(*buffer_);
 		break;
 
-	case LFUN_ERROR_NEXT:
-		bv_funcs::gotoInset(bv_, InsetBase::ERROR_CODE, false);
-		break;
-
 	case LFUN_NOTE_NEXT:
 		bv_funcs::gotoInset(bv_, InsetBase::NOTE_CODE, false);
 		break;
diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 73644625f1..2125c5706b 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -263,6 +263,8 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
 	string contents;
 	DocIterator tmpdit = dit;
 	tmpdit.forwardInset();
+	if (!tmpdit)
+		return false;
 
 	if (same_content) {
 		InsetBase const * inset = tmpdit.nextInset();
diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 4a9dcb280b..29fd67754d 100644
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -78,7 +78,6 @@ TranslatorMap const build_translator()
 		InsetName("external", InsetBase::EXTERNAL_CODE),
 		InsetName("caption", InsetBase::CAPTION_CODE),
 		InsetName("mathmacro", InsetBase::MATHMACRO_CODE),
-		InsetName("error", InsetBase::ERROR_CODE),
 		InsetName("cite", InsetBase::CITE_CODE),
 		InsetName("float_list", InsetBase::FLOAT_LIST_CODE),
 		InsetName("index_print", InsetBase::INDEX_PRINT_CODE),
diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index c6dfd76b11..fc8907a223 100644
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -295,8 +295,6 @@ public:
 		///
 		MATHMACRO_CODE, // 30
 		///
-		ERROR_CODE,
-		///
 		CITE_CODE,
 		///
 		FLOAT_LIST_CODE,