Made marshaller throw relevant exception