Clean up + handled EDD error