nvda

808d0d74 - Correct a few places where we are trying to do integer comparisons with None.