Second cut at rescuing nil messages