Put the check for empty msg back in. The previous commit was faulty.