changed minor things

Small changes to error handling
.
Merge branch 'master' of https://github.com/jorisadri/OAMK-RunningMat

Conflicts:
	RunningMat/RunningMat/bin/Debug/RunningMat.vshost.exe.manifest