Fixed a regression bug that kept throwing NullPointerException
Merge branch 'master' of git@github.com:ucam-cl-dtg/urop-2014-git.git