diff --git a/Modules/ToFHardware/files.cmake b/Modules/ToFHardware/files.cmake
index 3af83cdb24..b2b385a23f 100644
--- a/Modules/ToFHardware/files.cmake
+++ b/Modules/ToFHardware/files.cmake
@@ -1,80 +1,80 @@
 SET(CPP_FILES
   mitkToFImageGrabberCreator.cpp
   mitkToFImageGrabber.cpp
   mitkToFOpenCVImageGrabber.cpp
   mitkToFCameraDevice.cpp
   mitkToFCameraMITKPlayerController.cpp
   mitkToFCameraMITKPlayerDevice.cpp
   mitkToFCameraPMDDevice.cpp
   mitkToFCameraPMDPlayerDevice.cpp
   mitkToFCameraPMDMITKPlayerDevice.cpp
   mitkToFCameraPMDO3Device.cpp
   mitkToFCameraPMDCamCubeDevice.cpp
   mitkToFCameraPMDCamBoardDevice.cpp
   mitkToFCameraMESADevice.cpp
   mitkToFCameraMESASR4000Device.cpp
   mitkToFImageRecorder.cpp
   mitkToFImageRecorderFilter.cpp
   mitkToFImageWriter.cpp
   mitkToFImageCsvWriter.cpp
 )
 
 IF(MITK_USE_TOF_PMDCAMCUBE)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDMITKPlayerController.cpp
   mitkToFCameraPMDCamCubeController.cpp
   mitkToFCameraPMDController.cpp
 )
 IF(WIN32)
   IF(CMAKE_CL_64)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp)
   ELSE(CMAKE_CL_64)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerController.cpp)
   ENDIF(CMAKE_CL_64)
 ELSE(WIN32)
     SET(CPP_FILES ${CPP_FILES} mitkToFCameraPMDPlayerControllerStub.cpp)
 ENDIF(WIN32)
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDPlayerControllerStub.cpp
   mitkToFCameraPMDMITKPlayerControllerStub.cpp
   mitkToFCameraPMDCamCubeControllerStub.cpp
   mitkToFCameraPMDControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDCAMCUBE)
 
 IF(MITK_USE_TOF_PMDO3)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDO3Controller.cpp
   mitkToFCameraPMDController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDO3ControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDO3)
 
 IF(MITK_USE_TOF_PMDCAMBOARD)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDCamBoardController.cpp
   mitkToFCameraPMDController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraPMDCamBoardControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_PMDCAMBOARD)
 
 IF(MITK_USE_TOF_MESASR4000)
 SET(CPP_FILES ${CPP_FILES}
   mitkToFCameraMESASR4000Controller.cpp
   mitkToFCameraMESAController.cpp
 )
 ELSE()
 SET(CPP_FILES ${CPP_FILES}
-  mitkToFCameraMESAController.cpp
+  mitkToFCameraMESAControllerStub.cpp
   mitkToFCameraMESASR4000ControllerStub.cpp
 )
 ENDIF(MITK_USE_TOF_MESASR4000)
 
 
diff --git a/Modules/ToFHardware/mitkToFCameraMESAController.cpp b/Modules/ToFHardware/mitkToFCameraMESAController.cpp
index 5650fff8c3..7a5baf81d5 100644
--- a/Modules/ToFHardware/mitkToFCameraMESAController.cpp
+++ b/Modules/ToFHardware/mitkToFCameraMESAController.cpp
@@ -1,145 +1,125 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2010-05-27 16:06:53 +0200 (Do, 27 Mai 2010) $
 Version:   $Revision: $
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #include "mitkToFCameraMESAController.h"
 #include <libMesaSR.h>
 #include <string.h>
 
 CMesaDevice* m_MESAHandle=0;
 
 namespace mitk
 {
   ToFCameraMESAController::ToFCameraMESAController(): m_MESARes(0), m_PixelNumber(40000), m_NumberOfBytes(0), 
     m_CaptureWidth(0), m_CaptureHeight(0), m_NumImg(0), m_MaxRangeFactor(0.0), m_ConnectionCheck(false), 
     m_InputFileName("")
   {
   }
 
   ToFCameraMESAController::~ToFCameraMESAController()
   {
   }
 
   bool ToFCameraMESAController::CloseCameraConnection()
   {
     m_MESARes = SR_Close(m_MESAHandle); //res=SR_Close(srCam);
     m_ConnectionCheck = ErrorText(m_MESARes);
     m_MESAHandle = 0;
     return m_ConnectionCheck;
   } 
 
   bool ToFCameraMESAController::ErrorText(int error)
   {
     //if(error != MESA_OK)
     //{
     //  //pmdGetLastError (m_MESAHandle, m_MESAError, 128);
     //  //MITK_ERROR << "Camera Error " << m_MESAError;
     //  return false;
     //}
     //else return true;
     return true;
   }
 
   bool ToFCameraMESAController::UpdateCamera()
   {
     m_MESARes = SR_Acquire(m_MESAHandle); //res=SR_Acquire(srCam);
     //return ErrorText(m_MESARes);
     return true;
   }
 
   bool ToFCameraMESAController::GetAmplitudes(float* amplitudeArray)
   {
     unsigned short* data;
     data = (unsigned short*)SR_GetImage(m_MESAHandle, 1);
     for (int i=0; i<this->m_PixelNumber; i++)
     {
       if (data[i] & 0x8000) // bit 16 indicates saturation
       {
         amplitudeArray[i] = 0;
       }
       else
       {
         unsigned short value = data[i] & 0x7fff; // bit 16 indicates saturation
         unsigned short value2 = value >> 2; // bits 1 and 2 are reserved/unused
         amplitudeArray[i] = value2;
       }
     }
 	  return true;
   }
 
   bool ToFCameraMESAController::GetIntensities(float* intensityArray)
   {
     unsigned short* data;
     data = (unsigned short*)SR_GetImage(m_MESAHandle, 1);
     for (int i=0; i<this->m_PixelNumber; i++)
     {
       intensityArray[i] = data[i];
     }
 	  return true;
   }
 
   bool ToFCameraMESAController::GetDistances(float* distanceArray)
   {
     //this->m_MESARes = pmdGetDistances(m_MESAHandle, distanceArray, this->m_NumberOfBytes);
     //return ErrorText(this->m_MESARes);
     unsigned short* data;
     /*
     for(i=0; i<m_NumImg; i++)
     {
       data = SR_GetImage(m_MESAHandle, i);
     }
     */
     data = (unsigned short*)SR_GetImage(m_MESAHandle, 0);
     for (int i=0; i<this->m_PixelNumber; i++)
     {
       if (data[i] < 0xFFF8)
       {
         distanceArray[i] = data[i] * this->m_MaxRangeFactor;
       }
       else
       {
         distanceArray[i] = 0.0;
       }
     }
 
 	  return true;
   }
 
-  int ToFCameraMESAController::SetIntegrationTime(unsigned int integrationTime)
-  {
-	return 0;
-  }
-
-  int ToFCameraMESAController::GetIntegrationTime()
-  {
-	return 0;
-  }
-
-  int ToFCameraMESAController::SetModulationFrequency(unsigned int modulationFrequency)
-  {
-	return 0;
-  }
-
-  int ToFCameraMESAController::GetModulationFrequency()
-  {
-	return 0;
-  }
-
   void ToFCameraMESAController::SetInputFileName(std::string inputFileName)
   {
     this->m_InputFileName = inputFileName;
   }
 }
diff --git a/Modules/ToFHardware/mitkToFCameraMESAControllerStub.cpp b/Modules/ToFHardware/mitkToFCameraMESAControllerStub.cpp
new file mode 100644
index 0000000000..270018c830
--- /dev/null
+++ b/Modules/ToFHardware/mitkToFCameraMESAControllerStub.cpp
@@ -0,0 +1,76 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Module:    $RCSfile$
+Language:  C++
+Date:      $Date: 2010-05-27 16:06:53 +0200 (Do, 27 Mai 2010) $
+Version:   $Revision: $
+
+Copyright (c) German Cancer Research Center, Division of Medical and
+Biological Informatics. All rights reserved.
+See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
+
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "mitkToFCameraMESAController.h"
+#include <libMesaSR.h>
+#include <string.h>
+
+CMesaDevice* m_MESAHandle=0;
+
+namespace mitk
+{
+  ToFCameraMESAController::ToFCameraMESAController()
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+  }
+
+  ToFCameraMESAController::~ToFCameraMESAController()
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+  }
+
+  bool ToFCameraMESAController::CloseCameraConnection()
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+    return true;
+  } 
+
+  bool ToFCameraMESAController::ErrorText(int error)
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+    return true;
+  }
+
+  bool ToFCameraMESAController::UpdateCamera()
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+    return true;
+  }
+
+  bool ToFCameraMESAController::GetAmplitudes(float* amplitudeArray)
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+	  return true;
+  }
+
+  bool ToFCameraMESAController::GetIntensities(float* intensityArray)
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+	  return true;
+  }
+
+  bool ToFCameraMESAController::GetDistances(float* distanceArray)
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+	  return true;
+  }
+
+  void ToFCameraMESAController::SetInputFileName(std::string inputFileName)
+  {
+    MITK_WARN("ToF") << "Error: MESA camera currently not available"; 
+  }
+}