Merging in QUOTA_EXCEEDED_ERR fix.