Eliminate nested cases in elysium_bs_serial plus more error returns