Some minor changes. Also catches error if attempt to load nn without files