Fixed possible "Call to a member function format() on a non-object.". Closes #29.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed possible "Call to a member function format() on a non-object.". Closes #29.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'