Disclosed is a method for decoding an optical data signal. Said optical data signal is phase and amplitude modulated according to a constellation diagram with at least eight constellation points representing non-binary symbols. Said decoding method comprises the following steps: —carrying out a carrier phase recovery of a received signal ignoring the possible occurrence of phase slips, —decoding said signal after phase recovery, wherein in said decoding, possible cycle slips occurring during phase recovery are modelled as virtual input to an equivalent encoder assumed by the decoding scheme. Further disclosed are a related encoding method as well as a receiver and a transmitter.