added some exception handling ... not complete - Needs more work to do !

Now we do not navigate to the error page