removed separate exception handling