removed error handling from the common project