Give catalog and schema a name to be more informative and avoid NPE's