Added better handling of invalid/missing competition and round