Update core data image handling, updated for error if there was no image available