Small fixes to prevent mysterious exits.
Merge branch 'jhqt' of https://github.com/UMLComputerGraphics/GraphicsProject into jhqt