Fix bug with nil status