Let DatabaseManager.getInstance() throw exceptions instead of returning null when instanceId cannot be found
Merge branch 'master' into pattern_refactor