Fixed possible issue with BaseException.
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/xlcloud-ci