Changed to try/catch dict.  Fixes #206 more speedily