Error handling fix + rendering body fix