Fixed rating issues (NPE)