add validation of DataHandler
remove empty line