import error handling, delegation fixes