Added data check in order to avoid empty values.