It now only takes the device information if the table location in the database is blank.  This fixes #7655.