Checking $exceptions for null
Checking $exceptions for null
Checking $exceptions for null
Merge branch 'master' of https://github.com/codinpsycho/psycho_store

Conflicts:
	application/models/database.php