Added null return when nothing is in the datastore