Updated tip prepopulate checks.
Updated tip prepopulate checks.