* Added error checking (suggested from Sven Mueller)