Merge "Added defensive code to prevent system crash" into nyc-dev