added some code to handle null DataHolder in the interface defined methods.