Index: /OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h (revision 4772)
+++ /OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h (revision 10757)
@@ -3,5 +3,5 @@
 //////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2002 Tanguy Fautré.
+//  Copyright (C) 2002 Tanguy Fautrￜ.
 //
 //  This software is provided 'as-is', without any express or implied
@@ -21,5 +21,5 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
-//  Tanguy Fautré
+//  Tanguy Fautrￜ
 //  softdev@pandora.be
 //
@@ -45,5 +45,4 @@
 #define TRISTRIP_HEAP_ARRAY_H
 
-
 // namespace common_structures
 namespace common_structures {
@@ -149,6 +148,8 @@
 inline const T & heap_array<T, CmpT>::top() const {
     // Debug check to ensure heap is not empty
-    //assert(! empty());
-    if (empty()) throw "heap_array<T, CmpT>::top() error, heap empty";
+    if (empty())
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::top() error, heap empty."<<std::endl;
+    }
 
     return m_Heap.front().m_Elem;
@@ -160,5 +161,8 @@
     // Debug check to ensure element is still present
     //assert(! removed(i));
-    if (removed(i)) throw "heap_array<T, CmpT>::peek(size_t i) error";
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::peek(size_t i) error."<<std::endl;
+    }
 
     return (m_Heap[m_Finder[i]].m_Elem);
@@ -177,6 +181,9 @@
 
     // Debug check to ensure heap is not empty
-    //assert(! empty());
-    if (empty()) throw "heap_array<T, CmpT>::pop() error, heap empty";
+    if (empty()) 
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::pop() error, heap empty."<<std::endl;;
+        return;
+    }
     
     Swap(0, size() - 1);
@@ -189,5 +196,8 @@
 inline size_t heap_array<T, CmpT>::push(const T & Elem) {
     if (m_Locked)
-        throw "heap_is_locked";
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::push() heap_is_locked."<<std::endl;;
+        return 0;
+    }
 
     size_t Id = size();
@@ -205,6 +215,10 @@
 
     // Debug check to ensure element is still present
-    if (removed(i)) throw "heap_array<T, CmpT>::erase(size_t i) error";
-
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::erase(size_t i) error."<<std::endl;;
+        return;
+    }
+    
     size_t j = m_Finder[i];
 
@@ -240,5 +254,9 @@
     // Debug check to ensure element is still present
     // assert(! removed(i));
-    if (removed(i)) throw "heap_array<T, CmpT>::update(size_t i, const T & Elem) error";
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::update(size_t i, const T & Elem) error."<<std::endl;;
+        return;
+    }
 
     size_t j = m_Finder[i];
Index: /OpenSceneGraph/trunk/src/osgUtil/TriStrip_graph_array.h
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/TriStrip_graph_array.h (revision 9655)
+++ /OpenSceneGraph/trunk/src/osgUtil/TriStrip_graph_array.h (revision 10757)
@@ -3,5 +3,5 @@
 //////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2002 Tanguy Fautré.
+//  Copyright (C) 2002 Tanguy Fautrￜ.
 //
 //  This software is provided 'as-is', without any express or implied
@@ -21,5 +21,5 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
-//  Tanguy Fautré
+//  Tanguy Fautrￜ
 //  softdev@pandora.be
 //
@@ -259,8 +259,4 @@
 template <class nodetype, class arctype>
 inline typename graph_array<nodetype, arctype>::node & graph_array<nodetype, arctype>::operator [] (const nodeid & i) {
-    // Debug check
-    // assert(i < size());
-    if (i >= size()) throw "graph_array<nodetype, arctype>::operator [] out of range";
-
     return m_Nodes[i];
 }
@@ -269,8 +265,4 @@
 template <class nodetype, class arctype>
 inline const typename graph_array<nodetype, arctype>::node & graph_array<nodetype, arctype>::operator [] (const nodeid & i) const {
-    // Debug check
-    // assert(i < size());
-    if (i >= size()) throw "graph_array<nodetype, arctype>::operator [] out of range";
-
     return m_Nodes[i];
 }
Index: /OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.cpp (revision 10755)
+++ /OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.cpp (revision 10757)
@@ -19,6 +19,6 @@
 //////////////////////////////////////////////////////////////////////
 
+#include <osg/Notify>
 #include "TriStrip_tri_stripper.h"
-#include <osg/Notify>