Fixed dependency on exceptions