put a or instead of an and in check for null :/