Modal alert added, error reporting completed
Now resilient to FB errors in the process