Merge branch 'nickcompletecrashbugfix'