fixed exception handling and endless retry-loops...