last fixes for new deployment exception handling