[MOD] Error handling revised
Merge branch 'stable'