Fix for the bug 708

Just a catch and a rethrow