Rolled back fixes; adding more logging to deduce crash location