This should fix travis.

Also ensuring that we don't try to kill when pid is nil.