Added checking on empty DataStore