Fixed nullpointer on empty entry block