Handle inturrupt a bit nicer