Messages don't always have endpoints. Fixes #405
Removed silly class