Error checking.
Merge remote-tracking branch 'origin/WorfBot' into FdsWorfBot