debug
Add ResolvError exception handling
Fix indent
Fix indent