The wrong variable was set, so we were returning invalid memory. Oops.
Also fixes up the error paths to make it more obvious what happens.