fixed possible crash in resolver