Merging 05fe09b781b873fe16abc48cf13773f2039617ed into master: "Found some strange errors where None was returned instead of a response..."