Changed booleans to no longer return false, if they are in fact null