Added basic error handling.
Refactored code.
Merge branch 'master' into stage

Conflicts:
	apps/fusion/controllers/NodeController.php