[#22] Fixed NullPointerException issue.