Add null check to prevent errors on disable
Fix incorrect logging
Add hopper support for container-transaction