[FIX] Better error messages: #922