Bug 25809 (Patch by Finn Bock) NPE for incorrectly created tables fixed. Also changed text of warning message.