Check whether the current feature set works for bots and add safe-guards where necessary #148