Move command listeners init in finally section