Trying not to fail when empty message is received