unnecessary try-catch block removed
fix community compilation
Merge remote branch 'origin/master'