Add error check and log for EOS event