fix sethandler only command behavior

Change-Id: I876de3f5c7e112c109d80b5820743a0bc760937b