Hub modifications to prevent exception firing