Exception Handeled
Merge branch 'dev' of github.com:AliensGoo/thesisPI into dev