small issues and catching error on bad format of event body