Fixing the two.
Fixed error on quit, cli