Added error tracing/handling