corrected two 'var may be used uninitialized' warnings