Added custom error handers