Made deserialisation more resilient to bad input
Added handling for AccountEventHandler (hopefully)