Improve activity not found error

Fix #319