Fixed small warnings and added back exception handler
Fixed filter test