removed if else block
added try catch
Merge branch 'master' of https://github.com/uiucseclab/MagBastard