Fixing #111
First shot on #112 (Action Puis Action)
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test
Merge branch 'master' of https://github.com/appsgate2015/appsgate into test
Less Exceptions are thrown