Adapted time to display while waiting
removed throwing exceptions