Resolving issue #59 ("None" displayed when it shouldn't be)