Minor fixes for error handling and change of the ARI URI in the demo application - we really need to remove that and turn it into something more workable.