Added custom exception types for #201