Fixed: bug when not returning a PostgreSQL instance