V1.3

Pull custom error handling code