quick and dirty fix for FLINK-927 and added more diagnostics information