Fixed incorrect error handling and name display in the right menu
Merged two commits
Merge branch 'master' of https://github.com/happah-graphics/happah.git

Conflicts:
	src/main/core/SceneManager.cpp
Merge branch 'master' of https://github.com/happah-graphics/happah.git

Conflicts:
	src/main/core/SceneManager.cpp