404 proper handle added

From here it can be counted as a stable working alpha =)