Added support for org & user and additional error handling