[Fixed object null exceptions]