Improve error handling

Added SIGINT handler; 'except' blocks no longer catch all Errors