Index: trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12192)
+++ trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12274)
@@ -610,28 +610,34 @@
     rawEventData = new int16_t[(1440+160)*nRoi];
     waveLetArray = new int16_t[1024*1440];
-    if (!inputFile->SetPtrAddress("Data", rawEventData)){
-        cout << "Missing column " << "Data" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("EventNum", &eventNum)){
-        cout << "Missing column " << "EventNum" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("TriggerType", &triggerType)){
-        cout << "Missing column " << "TriggerType" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("SoftTrig", &softTrig)){
-        cout << "Missing column " << "SoftTrig" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("PCTime", pcTime)){
-        cout << "Missing column " << "PCTime" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("BoardTime", boardTime)){
-        cout << "Missing column " << "BoardTime" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("StartCellData", startPix)){
-        cout << "Missing column " << "StartCellData" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
-    if (!inputFile->SetPtrAddress("StartCellTimeMarker", startTM)){
-        cout << "Missing column " << "StartCellTimeMarker" << " Aborting load..." << endl;
-        nRoi = nRows = 0;return;}
+    try
+    {
+        inputFile->SetPtrAddress("Data", rawEventData);
+        inputFile->SetPtrAddress("EventNum", &eventNum);
+        inputFile->SetPtrAddress("TriggerType", &triggerType);
+        inputFile->SetPtrAddress("SoftTrig", &softTrig);
+        inputFile->SetPtrAddress("BoardTime", boardTime);
+        inputFile->SetPtrAddress("StartCellData", startPix);
+        inputFile->SetPtrAddress("StartCellTimeMarker", startTM);
+    }
+    catch (const runtime_error &e)
+    {
+        cout << e.what() << endl;
+        cout << "Loading aborted." << endl;
+
+        nRoi = nRows = 0;
+
+        return;
+    }
+
+    try
+    {
+        pcTime[0] = pcTime[1] = 0;
+        inputFile->SetPtrAddress("UnixTimeUTC", pcTime);
+    }
+    catch (const runtime_error&)
+    {
+    }
+
+
     int backupStep = eventStep;
     rowNum = -1;