Made sure it doesn't have null pointer exceptions anymore

Just commented two lines. If you uncomment then runtime errors will
occur due to bad design.