better error handling, a few more entity fields