Add SIGINT handler.
Add missing error/passed keys.