Improved error message for a known error
Improved existing tables handling and some fixes related to #1103