Addressed issue of quiet fail when data is empty