diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
index 717bf4063c1134f9a40855676ceb68a7232b7dde..4ff0fa22fd02d70e3f7a6fc3e4bc1b21464beab1 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
@@ -47,7 +47,7 @@ namespace asg
 
 #ifdef XAOD_STANDALONE
       to = ToolHandle<T1> (dynamic_cast<T1*>(&*from));
-      if (!from.empty() && &*to == nullptr)
+      if (!from.empty() && to.operator->() == nullptr)
       {
 	ANA_MSG_ERROR ("failed to cast from type " << typeid(T2).name() << " to  " << typeid(T1).name());
 	return StatusCode::FAILURE;
@@ -1293,7 +1293,7 @@ namespace asg
 
     try
     {
-      toolPtr = &*toolHandle;
+      toolPtr = toolHandle.operator->();
       if (toolPtr == nullptr)
       {
 	ANA_MSG_ERROR ("failed to retrieve tool from tool handle " << *m_handleUser);