updated the error handling for changest imports