MODE-2259 Fixed the WebApp handlers.
Merge pull request #1181 from hchiorean/MODE-2259

MODE-2259 Fixed the WebApp handlers.