Fix #8 ExecuteQuery should never return null