Widget lookup updated to allow better diagnostics