Module Controllers die

Module controllers to die after returning a JSON error
Merge branch 'master' of https://github.com/da1rren/Group-A