added data checks to user calls