Modified to excluded null identity values
Extended javadoc