Unifiy error msg if unable to allocate memory
Merge pull request #192 from alexander-zimmermann/nits

Unifiy error msg if unable to allocate memory