added exception handlign
post-release sthlm