[WIP-3] Cleanup response handling.
Merge pull request #2 from DABSquared/KI-325

[WIP-3] Cleanup response handling.