Make sure calls for postgre connection safer

Etp-server can hang forever if the connection is reset/used without a proper guard. This issue is just to fix some calls without the guard.