Use stop function in CLI instead of throw
Added logging architecture