Now with input check

Signed-off-by: Fabian Jeschko <fabian.jeschko@students.uibk.ac.at>