It will now catch empty states and I have added tests to test for them as well.
No changes between labsoc_sec and master
