add error message if directory doesn't exist
Merge branch 'msd' into dev

Conflicts:
	NEWS