redispatched files
fixed error handling