Fix potential memory leak in query handling