Summary: Check for existence of interface name earlier in code
Reviewed-by: michaelm