Fixed minor bug to emi-cream handler.