temporary: added an additional exception catching