fix possible NPE
updated to the latest EA build of fuse