removed general exception handling