Fixed an exception.
Merge branch 'Matthew94-master'