Merge pull request #1961 from jwillemsen/jwi-mb

Fixed potential memory leak on an allocation error, use nullptr

Author: jwillemsen