Handled empty input
Merge branch 'master' of https://github.com/claroline/CoreBundle