Make truthiness check more strict

Do not simply check to see if a particular object evaluates to True. Instead,
check whether that object is None. Change ordering of if/else statements to
accomodate this new, more strict check.