Restore the removed script tag
Handle errors when running Controller
Merge remote-tracking branch 'origin/master'