Merge pull request #4180 from davilla/die-warnings