1015520: Fixing org not found error