JLF-10: Made fail gracefully on missing states