more exception handling in release
even better exception handling