ALIEN-445: Add a condition in controller to solve an error