Added Custom Error Support