Added exception handling and survive when no Search tag is provided