Switch empty order messages

Fixes #527