Fix closing of callbacks on CLI exit

Fix closing of callbacks on CLI exit #1624