catch more stuff in smr-ec2 to ensure we shutdown instances correctly