Fixed crash in resolver