Added logging and updated non-concurrency check