Subject: Solved null error selceting prevoius organisation

Description:
1. In getDatabaseName just removed else condition.