diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigByteStreamInputSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigByteStreamInputSvc.cxx
index 0d045033e2185c654fd205cbfd3f3e2e1d4b5767..e6fe37f40051abf14122d56efd789ba4885cfc02 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigByteStreamInputSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigByteStreamInputSvc.cxx
@@ -45,22 +45,12 @@ StatusCode TrigByteStreamInputSvc::queryInterface(const InterfaceID& riid, void*
 // =============================================================================
 StatusCode TrigByteStreamInputSvc::initialize() {
   ATH_MSG_VERBOSE("start of " << __FUNCTION__);
-  StatusCode sc = StatusCode::SUCCESS;
 
-  sc = m_robDataProviderSvc.retrieve();
-  if (sc.isFailure()) {
-    ATH_MSG_ERROR("Failed to retrieve the ROB data provider");
-    return sc;
-  }
-
-  sc = m_evtStore.retrieve();
-  if (sc.isFailure()) {
-    ATH_MSG_ERROR("Failed to retrieve the event store service");
-    return sc;
-  }
+  CHECK(m_robDataProviderSvc.retrieve());
+  CHECK(m_evtStore.retrieve());
 
   ATH_MSG_VERBOSE("end of " << __FUNCTION__);
-  return sc;
+  return StatusCode::SUCCESS;
 }
 
 // =============================================================================
@@ -146,11 +136,10 @@ const RawEvent* TrigByteStreamInputSvc::currentEvent() const {
 // =============================================================================
 StatusCode TrigByteStreamInputSvc::generateDataHeader() {
   ATH_MSG_VERBOSE("start of " << __FUNCTION__);
+  
   IOpaqueAddress* iop = new ByteStreamAddress(ClassID_traits<EventInfo>::ID(), "ByteStreamEventInfo", "");
-  if (m_evtStore->recordAddress("ByteStreamEventInfo",iop).isFailure()) {
-    ATH_MSG_ERROR("Failed to record ByteStreamEventInfo address in StoreGate");
-    return StatusCode::FAILURE;
-  }
+  CHECK(m_evtStore->recordAddress("ByteStreamEventInfo",iop));
+
   ATH_MSG_VERBOSE("end of " << __FUNCTION__);
   return StatusCode::SUCCESS;
 }
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigEventSelectorByteStream.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigEventSelectorByteStream.cxx
index e99939ba623e6b969e1a643518b5a9d5b3e1c5c5..128d3d14e098c44aad977836119832a463b6b166 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigEventSelectorByteStream.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigEventSelectorByteStream.cxx
@@ -37,7 +37,7 @@ StatusCode TrigEventSelectorByteStream::queryInterface(const InterfaceID& riid,
   if(IEvtSelector::interfaceID().versionMatch(riid))
     *ppvInterface = static_cast<IEvtSelector*>(this);
   else
-    return Service::queryInterface(riid, ppvInterface);
+    return AthService::queryInterface(riid, ppvInterface);
 
   addRef();
   ATH_MSG_VERBOSE("end of " << __FUNCTION__);
@@ -50,22 +50,12 @@ StatusCode TrigEventSelectorByteStream::queryInterface(const InterfaceID& riid,
 StatusCode TrigEventSelectorByteStream::initialize()
 {
   ATH_MSG_VERBOSE("start of " << __FUNCTION__);
-  StatusCode sc = StatusCode::SUCCESS;
 
-  sc = m_eventSource.retrieve();
-  if (sc.isFailure()) {
-    ATH_MSG_ERROR("Failed to retrieve the event source service");
-    return sc;
-  }
-
-  sc = m_evtStore.retrieve();
-  if (sc.isFailure()) {
-    ATH_MSG_ERROR("Failed to retrieve the event store service");
-    return sc;
-  }
+  CHECK(m_eventSource.retrieve());
+  CHECK(m_evtStore.retrieve());
 
   ATH_MSG_VERBOSE("end of " << __FUNCTION__);
-  return sc;
+  return StatusCode::SUCCESS;
 }
 
 // =============================================================================
@@ -112,10 +102,7 @@ StatusCode TrigEventSelectorByteStream::next(IEvtSelector::Context& /*c*/) const
   }
 
   // In online implementation, this creates an EventInfo address for use in event processing
-  if (m_eventSource->generateDataHeader().isFailure()) {
-    ATH_MSG_ERROR("Failed to record ByteStream DataHeader / EventInfo in StoreGate");
-    return StatusCode::FAILURE;
-  }
+  CHECK(m_eventSource->generateDataHeader());
 
   ATH_MSG_VERBOSE("end of " << __FUNCTION__);
   return StatusCode::SUCCESS;