Fix error handling; it wasn't being thrown
Merge branch 'develop' of https://github.com/tlrimmer/TeamProj into develop