Added additional logging and non-blocking response