1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 3799180..4cd779a 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -88,7 +88,14 @@ namespace OpenSim.Framework
 
         public T Peek()
         {
-            return m_undolist[m_undolist.Count - 1];
+            if (m_undolist.Count > 0)
+            {
+                return m_undolist[m_undolist.Count - 1];
+            }
+            else
+            {
+                return default(T);
+            }
         }
 
         public void Clear()