More strict input handling