Added ObjectUtils in order to clean up null checks from many places in the code