Move error handling to dictionary_path.
Remove stubbing from test plus minor tweaks.