Removed disturbing general exception throw clause