Fix handling of missing nested include-files.

Generated an exception instead of the intended error message.
Test include missing file error message

Rename items in directory to improve name-space.
Corrected comment in new test.
Merge pull request #972 from hjoliver/bug-fix-missing-nested-include-file

Fix handling of missing nested include-files.