Fix for issue #297 Storage ExecutionEngine.executeWithRetry with error in exception handling

See description of issue #297 with comments. Includes new JUnit test for fix checking