'Handle' failing frame set ready, minor cleanups
Merge pull request #323 from tribal-tec/master

'Handle' failing frame set ready, minor cleanups