STY: fixed import order and error in event of None