Exception fix, not proper fix for issue #25