Eliminated recursion error for setting data. Expanded on quota check