Hotfix/error data

PR it.