Possible fix for ordering bug
Debug edition #2
Added exception handling for uri transformation request
Missing line