Fixed Null-pointer