Fixed exceptions thrown