added check for controller and trace message