Added to only throw exception in exceptional cases