diff --git a/src/export.cc b/src/export.cc
index f059f24d..5444a936 100644
--- a/src/export.cc
+++ b/src/export.cc
@@ -246,7 +246,7 @@ static void export_stl(const CGAL_Polyhedron &P, std::ostream &output)
 void export_stl(const CGAL_Nef_polyhedron *root_N, std::ostream &output)
 {
 	if (!root_N->p3->is_simple()) {
-		PRINT("Object isn't a valid 2-manifold! Modify your design.\n");
+		PRINT("Warning: Exported object may not be a valid 2-manifold and may need repair");
 	}
 
 	bool usePolySet = true;
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 4e8d2928..85b5a75a 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -1792,9 +1792,7 @@ void MainWindow::actionExport(export_type_e, QString, QString)
 
 	const CGAL_Nef_polyhedron *N = dynamic_cast<const CGAL_Nef_polyhedron *>(this->root_geom.get());
 	if (N && !N->p3->is_simple()) {
-	 	PRINT("Object isn't a valid 2-manifold! Modify your design. See http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/STL_Import_and_Export");
-	 	clearCurrentOutput();
-	 	return;
+	 	PRINT("Warning: Object may not be a valid 2-manifold and may need repair! See http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/STL_Import_and_Export");
 	}
 
 	QString title = QString("Export %1 File").arg(type_name);