- Fix the Db shortcut
- Add error checking for a field on table