From pr/89. Fixes error.data to error.message from timhaines

This builds off of pr/89