Add workaround for empty ResultSet