Added exceptions for later use