Removed one segmentation fault - that associated with current_procedure being null