Hotfix for 2.6.1 ThreadError on SIGINT

This only affects non-interactive mode and fixes issue #629.