Fix resolver throwing exceptions