changes from slavus to support FatJars
added a break to prevent RuntimeException