[FIX Test fixed
[MOD] Error handling revised