Stop HTIF more gracefully, supporting signatures