Added 'bye' if clause

Feel the code is sound,
need to research the actual data to double check that things are working