Minor change to not explicitly check for None when checking if an object
is set