Added ObjectUtils and fixed null pointer exception