Expetion fixed, pops up Error Dialog, makefile improved