#520 
fixes based on FindBugs results

change System.exit to return;