diff --git a/Core/Code/Common/mitkException.cpp b/Core/Code/Common/mitkException.cpp
index 5d6169997b..f374adcd9c 100644
--- a/Core/Code/Common/mitkException.cpp
+++ b/Core/Code/Common/mitkException.cpp
@@ -1,43 +1,43 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkException.h"
 
 void mitk::Exception::AddRethrowData(const char *file, unsigned int lineNumber, const char *message)
     {
     mitk::Exception::ReThrowData data = {file, lineNumber, message};
-    m_RethrowData.push_back(data);
+    this->m_RethrowData.push_back(data);
     }
     
 int mitk::Exception::GetNumberOfRethrows()
     {
-    return m_RethrowData.size();
+    return (int)m_RethrowData.size();
     }
     
 void mitk::Exception::GetRethrowData(int rethrowNumber, std::string &file, int &line, std::string &message)
     {
-    if (rethrowNumber > m_RethrowData.size())
+      if ((rethrowNumber >= m_RethrowData.size()) || (rethrowNumber<0))
         {
         file = "";
         line = 0;
         message = "";
         return;
         }    
         
     file = m_RethrowData.at(rethrowNumber).RethrowClassname;
     line = m_RethrowData.at(rethrowNumber).RethrowLine;
     message = m_RethrowData.at(rethrowNumber).RethrowMessage;
     }
diff --git a/Core/Code/Common/mitkException.h b/Core/Code/Common/mitkException.h
index 68cb7336a5..206eecdcdc 100644
--- a/Core/Code/Common/mitkException.h
+++ b/Core/Code/Common/mitkException.h
@@ -1,107 +1,113 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center, 
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without 
 even the implied warranty of MERCHANTABILITY or FITNESS FOR 
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKEXCEPTION_H_INCLUDED
 #define MITKEXCEPTION_H_INCLUDED
 
 #include <MitkExports.h>
 #include <itkExceptionObject.h>
+#include <vector>
 
 namespace mitk {
   /**Documentation
   * \brief   An object of this class represents an exception of MITK.
   *          Please don't instantiate exceptions manually, but use the
   *          exception macros (file mitkExceptionMacro.h) instead.
   *          Simple use in your code is:
   *
   *                  mitkThrow() << "optional exception message";
   *
   *          You can also define specialized exceptions which must inherit
   *          from this class. Please always use the mitkExceptionClassMacro
   *          when implementing specialized exceptions. A simple implementation
   *          can look like:
   *
   *          class MyException : public mitk::Exception
   *             {
   *             public:
   *             mitkExceptionClassMacro(MyException,mitk::Exception);
   *             };
   *
   *          You can then throw your specialized exceptions by using the macro
   *
   *                 mitkThrowException(MyException) << "optional exception message";
   */  
   class MITK_CORE_EXPORT Exception : public itk::ExceptionObject 
   {
   
   public:
     Exception(const char *file, unsigned int lineNumber=0,
                   const char *desc="None", const char *loc="Unknown") :
     itk::ExceptionObject(file,lineNumber,desc,loc){}
     
     virtual ~Exception() throw() {}
 
     itkTypeMacro(ClassName, SuperClassName);
     
     /** \brief Adds rethrow data to this exception. */
     void AddRethrowData(const char *file, unsigned int lineNumber, const char *message);
     
     /** \return Returns how often the exception was rethrown. */
     int GetNumberOfRethrows();
     
-    /** \brief Returns the rethrow data of the specified rethrow number. */ 
+    /** @return Returns the rethrow data of the specified rethrow number. Returns empty data, if the rethrowNumber doesn't exist. 
+      * @param rethrowNumber The internal number of the rethrow.
+      * @param file (returnvalue) This varaiable will be filled with the file of the specified rethrow.
+      * @param file (returnvalue) This varaiable will be filled with the line of the specified rethrow.
+      * @param file (returnvalue) This varaiable will be filled with the message of the specified rethrow.
+      */ 
     void GetRethrowData(int rethrowNumber, std::string &file, int &line, std::string &message);
     
     /** \brief Definition of the bit shift operator for this class.*/
     template <class T> inline Exception& operator<<(const T& data)
     {
       std::stringstream ss;
       ss << this->GetDescription() << data;
       this->SetDescription(ss.str());
       return *this;
     }
 
     /** \brief Definition of the bit shift operator for this class (for non const data).*/
     template <class T> inline Exception& operator<<(T& data)
     {
       std::stringstream ss;
       ss << this->GetDescription() << data;
       this->SetDescription(ss.str());
       return *this;
     }
 
     /** \brief Definition of the bit shift operator for this class (for functions).*/
     inline Exception& operator<<(std::ostream& (*func)(std::ostream&))
     {
       std::stringstream ss;
       ss << this->GetDescription() << func;
       this->SetDescription(ss.str());
       return *this;
     }
   protected:
   
   struct ReThrowData
     {
-    std::string RethrowClassname,
-    int RethrowLine,
-    std::string RethrowMessage
-    }
+    std::string RethrowClassname;
+    int RethrowLine;
+    std::string RethrowMessage;
+    };
    
    std::vector<ReThrowData> m_RethrowData;
    
   };
 } // namespace mitk
 #endif