Added check for nil user
v 0.1.0.b2