Fix RuntimeException when unmarshalling data