[FIX] Better error messages: #922
Merge branch 'stable'