--- a/hgext3rd/topic/__init__.py	Wed Mar 30 22:03:44 2016 -0700
+++ b/hgext3rd/topic/__init__.py	Wed Mar 30 22:04:25 2016 -0700
@@ -347,14 +347,11 @@
     if 'topic' in patchdata:
         extra['topic'] = patchdata['topic']
 
-if util.safehasattr(cmdutil, 'extraexport'):
-    cmdutil.extraexport.append('topic')
-    cmdutil.extraexportmap['topic'] = _exporttopic
-if util.safehasattr(cmdutil, 'extrapreimport'):
-    cmdutil.extrapreimport.append('topic')
-    cmdutil.extrapreimportmap['topic'] = _importtopic
-if util.safehasattr(patch, 'patchheadermap'):
-    patch.patchheadermap.append(('EXP-Topic', 'topic'))
+cmdutil.extraexport.append('topic')
+cmdutil.extraexportmap['topic'] = _exporttopic
+cmdutil.extrapreimport.append('topic')
+cmdutil.extrapreimportmap['topic'] = _importtopic
+patch.patchheadermap.append(('EXP-Topic', 'topic'))
 
 extensions.afterloaded('rebase', _fixrebase)