Fixed #320 - Null-ref exception