Re-added exception check