Fixed exception handling with loaded data.
Merge branch 'kinesis-exceptions' into develop

Fixes #2159, #2153.