added non existing object handling and test