more sensible checking of phase and slightly better logging thereof