bug 1257: added check if data is given