Removed dependency on exception