#22 nullPointerException bug was fixed