fixes for FF + additional exception catching