fix(issue#573): Small fixes to make code more stable
fix(issue#573): Small fixes to make code more stable

cjlee112/socraticqs2,cjlee112/socraticqs2,raccoongang/socraticqs2,raccoongang/socraticqs2,raccoongang/socraticqs2,cjlee112/socraticqs2,raccoongang/socraticqs2,cjlee112/socraticqs2