added null check for action and return null on the method instead