Rename variable in load_yaml to match load_json
Add a word, to make error message about nbd more understable
Reverting 210999f, as asked by @jkaplowitz