Add invalid action handling