Added graceful fails, user persistance