Commit 617ec438 introduced a regression caused by the assumption that
the XAxis and YAxis member variables are never null. This patch
handles the case where one or both of them are null.