Added checking for null/empty values in the universal getter