SWITCHARD-1904 Fix findbugs issues and provide exceptions