restored null checks in the action page