Made some changes to the Broker file to handle the not found case, as well as the Makefile and scripts