Development #6

* Fixed null exception error