Fixed bacis error handling if data is empty