Update for error message and maintaining max_memory in Kbytes now, rather than bytes.
Authored by: tswift 2015-08-25
Parent: [r8437]
Child: [r8439]